Changeset 205 for sbliveos2/trunk/drv16/rm.cpp

Timestamp:

Jun 14, 2007, 3:33:51 AM (18 years ago)

Author:

stevenhl

Message:

Make warnings away - SHL
Use drv16/midi_idc.h only - SHL
Add interrupts 16-23 - MF

File:

• sbliveos2/trunk/drv16/rm.cpp (modified) (5 diffs)

sbliveos2/trunk/drv16/rm.cpp

@@ -99 +99 @@
  *  allocate resources.
  */
-ResourceManager::ResourceManager(ULONG pciId)
+ResourceManager::ResourceManager(ULONG)
 {
    APIRET rc;
@@ -418 +418 @@
    int nResources;                     // Number of resources.
    PRESOURCELIST pRL;                  // Return value, pointer to resource list
-                                       // constructured in the heap.
+                                       // constructed in the heap.
    // Count up number of resources.
    for ( i=0, nResources=0; i<MAX_ISA_Dev_IO; ++i) {
@@ -438 +438 @@
 
    // Fill in resource list values.
-   _fmemset( (PVOID) pRL, 0, nBytes );
+   _fmemset( (PVOID) pRL, 0, nBytes );  // 13 Jun 07 SHL
    pRL->Count = nResources;
 
@@ -485 +485 @@
    }
 
-   return pRL;
+   return (NPRESOURCELIST)pRL;
 }
 
@@ -652 +652 @@
 {
    APIRET rc;
+   // 13 Jun 07 SHL fixme to check overflow even though unlikely
    USHORT nBytes =
-            sizeof(AHRESOURCE) + (sizeof(HRESOURCE) * pResourceList->Count);
+            sizeof(AHRESOURCE) + (sizeof(HRESOURCE) * (USHORT)pResourceList->Count);
    NPAHRESOURCE pahResource = (NPAHRESOURCE) malloc( nBytes );
                                        // Handles for allocated resources are saved here.