Kernel - Reworked PCI API to be cleaner

- Part of some mods to get UDIref ported (not in git)

diff --git a/Kernel/drv/pci.c b/Kernel/drv/pci.c
index 8dc947c..1a555d7 100644 (file)
--- a/Kernel/drv/pci.c
+++ b/Kernel/drv/pci.c
@@ -28,7 +28,7 @@ typedef struct sPCIDevice
                };\r
                Uint16  oc;\r
        };\r
-       Uint16  revision;\r
+       Uint8   revision, progif;\r
        Uint32  ConfigCache[256/4];\r
        char    Name[8];\r
        tVFS_Node       Node;\r
@@ -42,25 +42,10 @@ typedef struct sPCIDevice
  int   PCI_Install(char **Arguments);\r
  int   PCI_ScanBus(int ID, int bFill);\r
  \r
-char   *PCI_ReadDirRoot(tVFS_Node *node, int pos);\r
-tVFS_Node      *PCI_FindDirRoot(tVFS_Node *node, const char *filename);\r
-Uint64 PCI_ReadDevice(tVFS_Node *node, Uint64 pos, Uint64 length, void *buffer);\r
-\r
-#if 0\r
- int   PCI_CountDevices(Uint16 vendor, Uint16 device, Uint16 fcn);\r
- int   PCI_GetDevice(Uint16 vendor, Uint16 device, Uint16 fcn, int idx);\r
- int   PCI_GetDeviceByClass(Uint16 class, Uint16 mask, int prev);\r
-Uint8  PCI_GetIRQ(int id);\r
-Uint32 PCI_GetBAR0(int id);\r
-Uint32 PCI_GetBAR1(int id);\r
-Uint32 PCI_GetBAR2(int id);\r
-Uint32 PCI_GetBAR3(int id);\r
-Uint32 PCI_GetBAR4(int id);\r
-Uint32 PCI_GetBAR5(int id);\r
-Uint16 PCI_AssignPort(int id, int bar, int count);\r
-#endif\r
-\r
- int   PCI_EnumDevice(Uint16 bus, Uint16 dev, Uint16 fcn, tPCIDevice *info);\r
+char   *PCI_int_ReadDirRoot(tVFS_Node *node, int pos);\r
+tVFS_Node      *PCI_int_FindDirRoot(tVFS_Node *node, const char *filename);\r
+Uint64 PCI_int_ReadDevice(tVFS_Node *node, Uint64 pos, Uint64 length, void *buffer);\r
+ int   PCI_int_EnumDevice(Uint16 bus, Uint16 dev, Uint16 fcn, tPCIDevice *info);\r
 \r
 // === GLOBALS ===\r
 MODULE_DEFINE(0, 0x0100, PCI, PCI_Install, NULL, NULL);\r
@@ -75,8 +60,8 @@ tDevFS_Driver gPCI_DriverStruct = {
        .Size = -1,\r
        .NumACLs = 1,\r
        .ACLs = &gVFS_ACL_EveryoneRX,\r
-       .ReadDir = PCI_ReadDirRoot,\r
-       .FindDir = PCI_FindDirRoot\r
+       .ReadDir = PCI_int_ReadDirRoot,\r
+       .FindDir = PCI_int_FindDirRoot\r
        }\r
 };\r
 Uint32 *gaPCI_PortBitmap = NULL;\r
@@ -159,7 +144,7 @@ int PCI_ScanBus(int BusID, int bFill)
                for( fcn = 0; fcn < 8; fcn++ )  // Max 8 functions per device\r
                {\r
                        // Check if the device/function exists\r
-                       if(!PCI_EnumDevice(BusID, dev, fcn, &devInfo))\r
+                       if(!PCI_int_EnumDevice(BusID, dev, fcn, &devInfo))\r
                                continue;\r
                        \r
                        if(devInfo.oc == PCI_OC_PCIBRIDGE)\r
@@ -196,10 +181,9 @@ int PCI_ScanBus(int BusID, int bFill)
 }\r
 \r
 /**\r
- * \fn char *PCI_ReadDirRoot(tVFS_Node *Node, int Pos)\r
  * \brief Read from Root of PCI Driver\r
 */\r
-char *PCI_ReadDirRoot(tVFS_Node *Node, int Pos)\r
+char *PCI_int_ReadDirRoot(tVFS_Node *Node, int Pos)\r
 {\r
        ENTER("pNode iPos", Node, Pos);\r
        if(Pos < 0 || Pos >= giPCI_DeviceCount) {\r
@@ -211,9 +195,8 @@ char *PCI_ReadDirRoot(tVFS_Node *Node, int Pos)
        return strdup( gPCI_Devices[Pos].Name );\r
 }\r
 /**\r
- * \fn tVFS_Node *PCI_FindDirRoot(tVFS_Node *node, const char *filename)\r
  */\r
-tVFS_Node *PCI_FindDirRoot(tVFS_Node *node, const char *filename)\r
+tVFS_Node *PCI_int_FindDirRoot(tVFS_Node *node, const char *filename)\r
 {\r
         int    bus,slot,fcn;\r
         int    i;\r
@@ -251,9 +234,8 @@ tVFS_Node *PCI_FindDirRoot(tVFS_Node *node, const char *filename)
 }\r
 \r
 /**\r
- * \fn Uint64 PCI_ReadDevice(tVFS_Node *node, Uint64 pos, Uint64 length, void *buffer)\r
  */\r
-Uint64 PCI_ReadDevice(tVFS_Node *node, Uint64 pos, Uint64 length, void *buffer)\r
+Uint64 PCI_int_ReadDevice(tVFS_Node *node, Uint64 pos, Uint64 length, void *buffer)\r
 {      \r
        if( pos + length > 256 )        return 0;\r
        \r
@@ -267,41 +249,35 @@ Uint64 PCI_ReadDevice(tVFS_Node *node, Uint64 pos, Uint64 length, void *buffer)
 \r
 // --- Kernel Code Interface ---\r
 /**\r
- \fn int PCI_CountDevices(Uint16 vendor, Uint16 device, Uint16 fcn)\r
- \brief Counts the devices with the specified codes\r
- \param vendor Vendor ID\r
- \param device Device ID\r
- \param fcn    Function ID\r
-*/\r
-int PCI_CountDevices(Uint16 vendor, Uint16 device, Uint16 fcn)\r
+ * \brief Counts the devices with the specified codes\r
+ * \param vendor       Vendor ID\r
+ * \param device       Device ID\r
+ */\r
+int PCI_CountDevices(Uint16 vendor, Uint16 device)\r
 {\r
        int i, ret=0;\r
        for(i=0;i<giPCI_DeviceCount;i++)\r
        {\r
                if(gPCI_Devices[i].vendor != vendor)    continue;\r
                if(gPCI_Devices[i].device != device)    continue;\r
-               if(gPCI_Devices[i].fcn != fcn)  continue;\r
                ret ++;\r
        }\r
        return ret;\r
 }\r
 \r
 /**\r
- \fn int PCI_GetDevice(Uint16 vendor, Uint16 device, Uint16 fcn, int idx)\r
- \brief Gets the ID of the specified PCI device\r
- \param vendor Vendor ID\r
- \param device Device ID\r
- \param fcn    Function IDs\r
- \param idx    Number of matching entry wanted\r
-*/\r
-int PCI_GetDevice(Uint16 vendor, Uint16 device, Uint16 fcn, int idx)\r
+ * \brief Gets the ID of the specified PCI device\r
+ * \param vendor       Vendor ID\r
+ * \param device       Device ID\r
+ * \param idx  Number of matching entry wanted\r
+ */\r
+tPCIDev PCI_GetDevice(Uint16 vendor, Uint16 device, int idx)\r
 {\r
         int    i, j=0;\r
        for(i=0;i<giPCI_DeviceCount;i++)\r
        {\r
                if(gPCI_Devices[i].vendor != vendor)    continue;\r
                if(gPCI_Devices[i].device != device)    continue;\r
-               if(gPCI_Devices[i].fcn != fcn)  continue;\r
                if(j == idx)    return i;\r
                j ++;\r
        }\r
@@ -309,13 +285,12 @@ int PCI_GetDevice(Uint16 vendor, Uint16 device, Uint16 fcn, int idx)
 }\r
 \r
 /**\r
- * \fn int PCI_GetDeviceByClass(Uint16 class, Uint16 mask, int prev)\r
  * \brief Gets the ID of a device by it's class code\r
  * \param class        Class Code\r
  * \param mask Mask for class comparison\r
  * \param prev ID of previous device (-1 for no previous)\r
  */\r
-int PCI_GetDeviceByClass(Uint16 class, Uint16 mask, int prev)\r
+tPCIDev PCI_GetDeviceByClass(Uint16 class, Uint16 mask, tPCIDev prev)\r
 {\r
         int    i;\r
        // Check if prev is negative (meaning get first)\r
@@ -330,85 +305,129 @@ int PCI_GetDeviceByClass(Uint16 class, Uint16 mask, int prev)
        return -1;\r
 }\r
 \r
-/**\r
- \fn Uint8 PCI_GetIRQ(int id)\r
-*/\r
-Uint8 PCI_GetIRQ(int id)\r
+int PCI_GetDeviceInfo(tPCIDev ID, Uint16 *Vendor, Uint16 *Device, Uint16 *Class)\r
 {\r
-       if(id < 0 || id >= giPCI_DeviceCount)\r
-               return 0;\r
-       return gPCI_Devices[id].ConfigCache[15];\r
-       //return PCI_CfgReadByte( gPCI_Devices[id].bus, gPCI_Devices[id].slot, gPCI_Devices[id].fcn, 0x3C);\r
+       tPCIDevice      *dev = &gPCI_Devices[ID];\r
+       if(ID < 0 || ID >= giPCI_DeviceCount)   return 1;\r
+       \r
+       if(Vendor)      *Vendor = dev->vendor;\r
+       if(Device)      *Device = dev->device;\r
+       if(Class)       *Class = dev->oc;\r
+       return 0;\r
 }\r
 \r
-/**\r
- \fn Uint32 PCI_GetBAR0(int id)\r
-*/\r
-Uint32 PCI_GetBAR0(int id)\r
+int PCI_GetDeviceVersion(tPCIDev ID, Uint8 *Revision, Uint8 *ProgIF)\r
 {\r
-       if(id < 0 || id >= giPCI_DeviceCount)\r
-               return 0;\r
-       return gPCI_Devices[id].ConfigCache[4];\r
+       tPCIDevice      *dev = &gPCI_Devices[ID];\r
+       if(ID < 0 || ID >= giPCI_DeviceCount)   return 1;\r
+       \r
+       if(Revision)    *Revision = dev->revision;\r
+       if(ProgIF)      *ProgIF = dev->progif;\r
+       return 0;\r
 }\r
 \r
-/**\r
- \fn Uint32 PCI_GetBAR1(int id)\r
-*/\r
-Uint32 PCI_GetBAR1(int id)\r
+int PCI_GetDeviceSubsys(tPCIDev ID, Uint16 *SubsystemVendor, Uint16 *SubsystemID)\r
 {\r
-       if(id < 0 || id >= giPCI_DeviceCount)\r
-               return 0;\r
-       return gPCI_Devices[id].ConfigCache[5];\r
+       tPCIDevice      *dev = &gPCI_Devices[ID];\r
+       if(ID < 0 || ID >= giPCI_DeviceCount)   return 1;\r
+       \r
+       if(SubsystemVendor)     *SubsystemVendor = dev->ConfigCache[0x2c/4] & 0xFFFF;\r
+       if(SubsystemID) *SubsystemID = dev->ConfigCache[0x2c/4] >> 16;\r
+\r
+       return 0;\r
 }\r
 \r
-/**\r
- \fn Uint32 PCI_GetBAR2(int id)\r
-*/\r
-Uint32 PCI_GetBAR2(int id)\r
+Uint32 PCI_ConfigRead(tPCIDev ID, int Offset, int Size)\r
 {\r
-       if(id < 0 || id >= giPCI_DeviceCount)\r
+       tPCIDevice      *dev;\r
+       Uint32  dword;\r
+       if( ID < 0 || ID >= giPCI_DeviceCount ) return 0;\r
+       if( Offset < 0 || Offset > 256 )        return 0;\r
+\r
+       // TODO: Should I support non-aligned reads?\r
+       if( Offset & (Size - 1) )       return 0;\r
+\r
+       dev = &gPCI_Devices[ID];\r
+\r
+       dword = PCI_CfgReadDWord(dev->bus, dev->slot, dev->fcn, Offset / 4);\r
+       gPCI_Devices[ID].ConfigCache[Offset/4] = dword;\r
+       switch( Size )\r
+       {\r
+       case 1: return (dword >> (8 * (Offset&3))) & 0xFF;\r
+       case 2: return (dword >> (8 * (Offset&2))) & 0xFFFF;\r
+       case 4: return dword;\r
+       default:\r
                return 0;\r
-       return gPCI_Devices[id].ConfigCache[6];\r
+       }\r
 }\r
 \r
-/**\r
- \fn Uint32 PCI_GetBAR3(int id)\r
-*/\r
-Uint32 PCI_GetBAR3(int id)\r
+void PCI_ConfigWrite(tPCIDev ID, int Offset, int Size, Uint32 Value)\r
 {\r
-       if(id < 0 || id >= giPCI_DeviceCount)\r
-               return 0;\r
-       return gPCI_Devices[id].ConfigCache[7];\r
+       tPCIDevice      *dev;\r
+       Uint32  dword;\r
+        int    shift;\r
+       if( ID < 0 || ID >= giPCI_DeviceCount ) return ;\r
+       if( Offset < 0 || Offset > 256 )        return ;\r
+       \r
+       dev = &gPCI_Devices[ID];\r
+\r
+       dword = PCI_CfgReadDWord(dev->bus, dev->slot, dev->fcn, Offset/4);\r
+       switch(Size)\r
+       {\r
+       case 1:\r
+               shift = (Offset&3)*8;\r
+               dword &= ~(0xFF << shift);\r
+               dword |= Value << shift;\r
+               break;\r
+       case 2:\r
+               shift = (Offset&2)*8;\r
+               dword &= ~(0xFFFF << shift);\r
+               dword |= Value << shift;\r
+               break;\r
+       case 4:\r
+               dword = Value;\r
+               break;\r
+       default:\r
+               return;\r
+       }\r
+       PCI_CfgWriteDWord(dev->bus, dev->slot, dev->fcn, Offset/4, dword);\r
 }\r
 \r
 /**\r
- \fn Uint32 PCI_GetBAR4(int id)\r
-*/\r
-Uint32 PCI_GetBAR4(int id)\r
+ * \brief Get the IRQ assigned to a device\r
+ */\r
+Uint8 PCI_GetIRQ(tPCIDev id)\r
 {\r
        if(id < 0 || id >= giPCI_DeviceCount)\r
                return 0;\r
-       return gPCI_Devices[id].ConfigCache[8];\r
+       return gPCI_Devices[id].ConfigCache[15] & 0xFF;\r
+       //return PCI_CfgReadByte( gPCI_Devices[id].bus, gPCI_Devices[id].slot, gPCI_Devices[id].fcn, 0x3C);\r
 }\r
 \r
 /**\r
- \fn Uint32 PCI_GetBAR5(int id)\r
-*/\r
-Uint32 PCI_GetBAR5(int id)\r
+ * \brief Read the a BAR (base address register) from the PCI config space\r
+ */\r
+Uint32 PCI_GetBAR(tPCIDev id, int BARNum)\r
 {\r
        if(id < 0 || id >= giPCI_DeviceCount)\r
                return 0;\r
-       return gPCI_Devices[id].ConfigCache[9];\r
+       if(BARNum < 0 || BARNum >= 6)\r
+               return 0;\r
+       return gPCI_Devices[id].ConfigCache[4+BARNum];\r
 }\r
 \r
-Uint16 PCI_AssignPort(int id, int bar, int count)\r
+#if 0\r
+/**\r
+ * \brief Assign a port to a BAR\r
+ */\r
+Uint16 PCI_AssignPort(tPCIDev ID, int bar, int Count)\r
 {\r
        #if 1\r
        Uint16  rv;\r
        tPCIDevice      *dev;\r
        \r
        if(id < 0 || id >= giPCI_DeviceCount)   return 0;\r
-       if(bar < 0 || bar > 5)  return 0;\r
+       if(bar < 0 || bar >= 6) return 0;\r
        dev = &gPCI_Devices[id];\r
        \r
        rv = PCI_CfgReadDWord( dev->bus, dev->slot, dev->fcn, 0x10+bar*4 );\r
@@ -480,12 +499,12 @@ Uint16 PCI_AssignPort(int id, int bar, int count)
        return portVals;\r
        #endif\r
 }\r
+#endif\r
 \r
 /**\r
- * \fn int PCI_EnumDevice(Uint16 bus, Uint16 slot, Uint16 fcn, tPCIDevice *info)\r
  * \brief Get device information for a slot/function\r
  */\r
-int PCI_EnumDevice(Uint16 bus, Uint16 slot, Uint16 fcn, tPCIDevice *info)\r
+int PCI_int_EnumDevice(Uint16 bus, Uint16 slot, Uint16 fcn, tPCIDevice *info)\r
 {\r
        Uint16  vendor;\r
         int    i;\r
@@ -531,7 +550,7 @@ int PCI_EnumDevice(Uint16 bus, Uint16 slot, Uint16 fcn, tPCIDevice *info)
        info->Node.NumACLs = 1;\r
        info->Node.ACLs = &gVFS_ACL_EveryoneRO;\r
        \r
-       info->Node.Read = PCI_ReadDevice;\r
+       info->Node.Read = PCI_int_ReadDevice;\r
        \r
        return 1;\r
 }\r
@@ -541,6 +560,10 @@ int PCI_EnumDevice(Uint16 bus, Uint16 slot, Uint16 fcn, tPCIDevice *info)
 EXPORT(PCI_CountDevices);\r
 EXPORT(PCI_GetDevice);\r
 EXPORT(PCI_GetDeviceByClass);\r
-EXPORT(PCI_AssignPort);\r
+EXPORT(PCI_GetDeviceInfo);\r
+EXPORT(PCI_GetDeviceVersion);\r
+EXPORT(PCI_GetDeviceSubsys);\r
+//EXPORT(PCI_AssignPort);\r
+EXPORT(PCI_GetBAR);\r
 EXPORT(PCI_GetIRQ);\r
 //*/\r

diff --git a/Kernel/include/acess.h b/Kernel/include/acess.h
index d4feaf7..3166476 100644 (file)
--- a/Kernel/include/acess.h
+++ b/Kernel/include/acess.h
@@ -100,6 +100,7 @@ typedef struct sKernelSymbol {
 // === FUNCTIONS ===
 // --- IRQs ---
 extern int     IRQ_AddHandler(int Num, void (*Callback)(int));
+extern void    IRQ_RemHandler(int Handle);
 
 // --- Logging ---
 extern void    Log_KernelPanic(const char *Ident, const char *Message, ...);

diff --git a/Kernel/include/drv_pci.h b/Kernel/include/drv_pci.h
index 128f105..9697df0 100644 (file)
--- a/Kernel/include/drv_pci.h
+++ b/Kernel/include/drv_pci.h
@@ -33,22 +33,26 @@ enum ePCIOverClasses
        PCI_OC_SCSI = 0x0100\r
 };\r
 \r
+typedef int    tPCIDev;\r
+\r
 /**\r
  * \brief Count PCI Devices\r
  * \r
  * Counts the number of devices with specified Vendor and Device IDs\r
  */\r
-extern int     PCI_CountDevices(Uint16 vendor, Uint16 device, Uint16 fcn);\r
-\r
-extern int     PCI_GetDevice(Uint16 vendor, Uint16 device, Uint16 fcn, int idx);\r
-extern int     PCI_GetDeviceByClass(Uint16 class, Uint16 mask, int prev);\r
-extern Uint8   PCI_GetIRQ(int id);\r
-extern Uint32  PCI_GetBAR0(int id);\r
-extern Uint32  PCI_GetBAR1(int id);\r
-extern Uint32  PCI_GetBAR2(int id);\r
-extern Uint32  PCI_GetBAR3(int id);\r
-extern Uint32  PCI_GetBAR4(int id);\r
-extern Uint32  PCI_GetBAR5(int id);\r
-extern Uint16  PCI_AssignPort(int id, int bar, int count);\r
+extern int     PCI_CountDevices(Uint16 VendorID, Uint16 DeviceID);\r
+extern tPCIDev PCI_GetDevice(Uint16 VendorID, Uint16 DeviceID, int index);\r
+extern tPCIDev PCI_GetDeviceByClass(Uint16 ClassCode, Uint16 Mask, tPCIDev prev);\r
+\r
+extern int     PCI_GetDeviceInfo(tPCIDev id, Uint16 *Vendor, Uint16 *Device, Uint16 *Class);\r
+extern int     PCI_GetDeviceVersion(tPCIDev id, Uint8 *Revision, Uint8 *ProgIF);\r
+extern int     PCI_GetDeviceSubsys(tPCIDev id, Uint16 *SubsystemVendor, Uint16 *SubsystemID);\r
+\r
+extern Uint32  PCI_ConfigRead(tPCIDev id, int Offset, int Size);\r
+extern void    PCI_ConfigWrite(tPCIDev id, int Offset, int Size, Uint32 Value);\r
+\r
+extern Uint8   PCI_GetIRQ(tPCIDev id);\r
+extern Uint32  PCI_GetBAR(tPCIDev id, int BAR);\r
+//extern Uint16        PCI_AssignPort(tPCIDev id, int bar, int count);\r
 \r
 #endif\r

diff --git a/Modules/Network/NE2000/ne2000.c b/Modules/Network/NE2000/ne2000.c
index 3fa85f4..cb760d6 100644 (file)
--- a/Modules/Network/NE2000/ne2000.c
+++ b/Modules/Network/NE2000/ne2000.c
@@ -118,14 +118,15 @@ tCard     *gpNe2k_Cards = NULL;
 int Ne2k_Install(char **Options)
 {
         int    i, j, k;
-        int    count, id, base;
+        int    count, base;
+       tPCIDev id;
        
        // --- Scan PCI Bus ---
        // Count Cards
        giNe2k_CardCount = 0;
        for( i = 0; i < NUM_COMPAT_DEVICES; i ++ )
        {
-               giNe2k_CardCount += PCI_CountDevices( csaCOMPAT_DEVICES[i].Vendor, csaCOMPAT_DEVICES[i].Device, 0 );
+               giNe2k_CardCount += PCI_CountDevices( csaCOMPAT_DEVICES[i].Vendor, csaCOMPAT_DEVICES[i].Device );
        }
        
        if( giNe2k_CardCount == 0 ) {
@@ -139,12 +140,12 @@ int Ne2k_Install(char **Options)
        
        for( i = 0; i < NUM_COMPAT_DEVICES; i ++ )
        {
-               count = PCI_CountDevices( csaCOMPAT_DEVICES[i].Vendor, csaCOMPAT_DEVICES[i].Device, 0 );
+               count = PCI_CountDevices( csaCOMPAT_DEVICES[i].Vendor, csaCOMPAT_DEVICES[i].Device );
                for( j = 0; j < count; j ++,k ++ )
                {
-                       id = PCI_GetDevice( csaCOMPAT_DEVICES[i].Vendor, csaCOMPAT_DEVICES[i].Device, 0, j );
+                       id = PCI_GetDevice( csaCOMPAT_DEVICES[i].Vendor, csaCOMPAT_DEVICES[i].Device, j );
                        // Create Structure
-                       base = PCI_AssignPort( id, 0, 0x20 );
+                       base = PCI_GetBAR( id, 0 );
                        gpNe2k_Cards[ k ].IOBase = base;
                        gpNe2k_Cards[ k ].IRQ = PCI_GetIRQ( id );
                        gpNe2k_Cards[ k ].NextMemPage = 64;

diff --git a/Modules/Network/RTL8139/rtl8139.c b/Modules/Network/RTL8139/rtl8139.c
index d77fe27..c2ec80a 100644 (file)
--- a/Modules/Network/RTL8139/rtl8139.c
+++ b/Modules/Network/RTL8139/rtl8139.c
@@ -125,7 +125,7 @@ int RTL8139_Install(char **Options)
        Uint16  base;
        tCard   *card;
        
-       giRTL8139_CardCount = PCI_CountDevices(VENDOR_ID, DEVICE_ID, 0);
+       giRTL8139_CardCount = PCI_CountDevices(VENDOR_ID, DEVICE_ID);
        Log_Debug("RTL8139", "%i cards", giRTL8139_CardCount);
        
        if( giRTL8139_CardCount == 0 )  return MODULE_ERR_NOTNEEDED;
@@ -133,10 +133,10 @@ int RTL8139_Install(char **Options)
        gaRTL8139_Cards = calloc( giRTL8139_CardCount, sizeof(tCard) );
        
        //while( (id = PCI_GetDevice(0x10EC, 0x8139, 0, id)) != -1 )
-       while( (id = PCI_GetDevice(VENDOR_ID, DEVICE_ID, 0, i)) != -1 )
+       while( (id = PCI_GetDevice(VENDOR_ID, DEVICE_ID, i)) != -1 )
        {
                card = &gaRTL8139_Cards[i];
-               base = PCI_AssignPort( id, 0, 0x100 );
+               base = PCI_GetBAR( id, 0 );
                card->IOBase = base;
                card->IRQ = PCI_GetIRQ( id );
                

diff --git a/Modules/Storage/ATA/io.c b/Modules/Storage/ATA/io.c
index 73c33b2..368c310 100644 (file)
--- a/Modules/Storage/ATA/io.c
+++ b/Modules/Storage/ATA/io.c
@@ -119,7 +119,7 @@ int ATA_SetupIO(void)
        // Get IDE Controller's PCI Entry
        ent = PCI_GetDeviceByClass(0x0101, 0xFFFF, -1);
        LOG("ent = %i", ent);
-       gATA_BusMasterBase = PCI_GetBAR4( ent );
+       gATA_BusMasterBase = PCI_GetBAR(ent, 4);
        if( gATA_BusMasterBase == 0 ) {
                Log_Warning("ATA", "It seems that there is no Bus Master Controller on this machine. Get one");
                // TODO: Use PIO mode instead
@@ -127,8 +127,8 @@ int ATA_SetupIO(void)
                return MODULE_ERR_NOTNEEDED;
        }
        
-       LOG("BAR5 = 0x%x", PCI_GetBAR5( ent ));
-       LOG("IRQ = %i", PCI_GetIRQ( ent ));
+       LOG("BAR5 = 0x%x", PCI_GetBAR(ent, 5));
+       LOG("IRQ = %i", PCI_GetIRQ(ent));
        
        // Map memory
        if( !(gATA_BusMasterBase & 1) )

diff --git a/Modules/USB/Core/uhci.c b/Modules/USB/Core/uhci.c
index fb92d54..948f6e6 100644 (file)
--- a/Modules/USB/Core/uhci.c
+++ b/Modules/USB/Core/uhci.c
@@ -1,127 +1,126 @@
-/*\r
- * Acess 2 USB Stack\r
- * Universal Host Controller Interface\r
- */\r
-#define DEBUG  1\r
-#include <acess.h>\r
-#include <vfs.h>\r
-#include <drv_pci.h>\r
-#include "usb.h"\r
-#include "uhci.h"\r
-\r
-// === CONSTANTS ===\r
-#define        MAX_CONTROLLERS 4\r
-#define NUM_TDs        1024\r
-\r
-// === PROTOTYPES ===\r
- int   UHCI_Initialise();\r
-void   UHCI_Cleanup();\r
- int   UHCI_IOCtl(tVFS_Node *node, int id, void *data);\r
- int   UHCI_Int_InitHost(tUHCI_Controller *Host);\r
-\r
+/*
+ * Acess 2 USB Stack
+ * Universal Host Controller Interface
+ */
+#define DEBUG  1
+#include <acess.h>
+#include <vfs.h>
+#include <drv_pci.h>
+#include "usb.h"
+#include "uhci.h"
+
+// === CONSTANTS ===
+#define        MAX_CONTROLLERS 4
+#define NUM_TDs        1024
+
+// === PROTOTYPES ===
+ int   UHCI_Initialise();
+void   UHCI_Cleanup();
+ int   UHCI_IOCtl(tVFS_Node *node, int id, void *data);
+ int   UHCI_Int_InitHost(tUHCI_Controller *Host);
+
 // === GLOBALS ===
-//Uint gaFrameList[1024];\r
-tUHCI_TD       gaUHCI_TDPool[NUM_TDs];\r
-tUHCI_Controller       gUHCI_Controllers[MAX_CONTROLLERS];\r
-\r
-// === CODE ===\r
-/**\r
- * \fn int UHCI_Initialise()\r
- * \brief Called to initialise the UHCI Driver\r
- */\r
-int UHCI_Initialise()\r
-{\r
-        int    i=0, id=-1;\r
-        int    ret;\r
-       \r
-       ENTER("");\r
-       \r
-       // Enumerate PCI Bus, getting a maximum of `MAX_CONTROLLERS` devices\r
-       while( (id = PCI_GetDeviceByClass(0x0C03, 0xFFFF, id)) >= 0 && i < MAX_CONTROLLERS )\r
-       {\r
-               // NOTE: Check "protocol" from PCI?\r
-               \r
-               gUHCI_Controllers[i].PciId = id;\r
-               // Assign a port range (BAR4, Reserve 32 ports)\r
-               //base = PCI_AssignPort( id, 4, 0x20 );\r
-               gUHCI_Controllers[i].IOBase = PCI_GetBAR4(id);\r
-               gUHCI_Controllers[i].IRQNum = PCI_GetIRQ(id);\r
-               \r
-               Log("[USB  ] Controller PCI #%i: IO Base = 0x%x, IRQ %i",\r
-                       id, gUHCI_Controllers[i].IOBase, gUHCI_Controllers[i].IRQNum);\r
-               \r
-               // Initialise Host\r
-               ret = UHCI_Int_InitHost(&gUHCI_Controllers[i]);\r
-               // Detect an error\r
-               if(ret != 0) {\r
-                       LEAVE('i', ret);\r
-                       return ret;\r
-               }\r
-               \r
-               i ++;\r
-       }\r
-       if(i == MAX_CONTROLLERS) {\r
-               Warning("[UHCI ] Over "EXPAND_STR(MAX_CONTROLLERS)" UHCI controllers detected, ignoring rest");\r
-       }\r
-       LEAVE('i', i);\r
-       return i;\r
-}\r
-\r
-/**\r
- * \fn void UHCI_Cleanup()\r
- * \brief Called just before module is unloaded\r
- */\r
-void UHCI_Cleanup()\r
-{\r
+//Uint gaFrameList[1024];
+tUHCI_TD       gaUHCI_TDPool[NUM_TDs];
+tUHCI_Controller       gUHCI_Controllers[MAX_CONTROLLERS];
+
+// === CODE ===
+/**
+ * \fn int UHCI_Initialise()
+ * \brief Called to initialise the UHCI Driver
+ */
+int UHCI_Initialise()
+{
+        int    i=0, id=-1;
+        int    ret;
+       
+       ENTER("");
+       
+       // Enumerate PCI Bus, getting a maximum of `MAX_CONTROLLERS` devices
+       while( (id = PCI_GetDeviceByClass(0x0C03, 0xFFFF, id)) >= 0 && i < MAX_CONTROLLERS )
+       {
+               // NOTE: Check "protocol" from PCI?
+               
+               gUHCI_Controllers[i].PciId = id;
+               // Assign a port range (BAR4, Reserve 32 ports)
+               gUHCI_Controllers[i].IOBase = PCI_GetBAR(id, 4);
+               gUHCI_Controllers[i].IRQNum = PCI_GetIRQ(id);
+               
+               Log("[USB  ] Controller PCI #%i: IO Base = 0x%x, IRQ %i",
+                       id, gUHCI_Controllers[i].IOBase, gUHCI_Controllers[i].IRQNum);
+               
+               // Initialise Host
+               ret = UHCI_Int_InitHost(&gUHCI_Controllers[i]);
+               // Detect an error
+               if(ret != 0) {
+                       LEAVE('i', ret);
+                       return ret;
+               }
+               
+               i ++;
+       }
+       if(i == MAX_CONTROLLERS) {
+               Log_Warning("UHCI", "Over "EXPAND_STR(MAX_CONTROLLERS)" UHCI controllers detected, ignoring rest");
+       }
+       LEAVE('i', i);
+       return i;
+}
+
+/**
+ * \fn void UHCI_Cleanup()
+ * \brief Called just before module is unloaded
+ */
+void UHCI_Cleanup()
+{
+}
+
+/**
+ * \brief Sends a packet to a device endpoint
+ */
+int UHCI_SendPacket(int ControllerId, int Length)
+{
+       //tUHCI_TD      *td = UHCI_AllocateTD();
+       return 0;
+}
+
+// === INTERNAL FUNCTIONS ===
+/**
+ * \fn int UHCI_Int_InitHost(tUCHI_Controller *Host)
+ * \brief Initialises a UHCI host controller
+ * \param Host Pointer - Host to initialise
+ */
+int UHCI_Int_InitHost(tUHCI_Controller *Host)
+{
+       ENTER("pHost", Host);
+       
+       outw( Host->IOBase + USBCMD, 4 );       // GRESET
+       // TODO: Wait for at least 10ms
+       outw( Host->IOBase + USBCMD, 0 );       // GRESET
+       
+       // Allocate Frame List
+       Host->FrameList = (void *) MM_AllocDMA(1, 32, &Host->PhysFrameList);    // 1 Page, 32-bit
+       if( !Host->FrameList ) {
+               Log_Warning("UHCI", "Unable to allocate frame list, aborting");
+               LEAVE('i', -1);
+               return -1;
+       }
+       LOG("Allocated frame list 0x%x (0x%x)", Host->FrameList, Host->PhysFrameList);
+       memsetd( Host->FrameList, 1, 1024 );    // Clear List (Disabling all entries)
+       
+       //! \todo Properly fill frame list
+       
+       // Set frame length to 1 ms
+       outb( Host->IOBase + SOFMOD, 64 );
+       
+       // Set Frame List Address
+       outd( Host->IOBase + FLBASEADD, Host->PhysFrameList );
+       
+       // Set Frame Number
+       outw( Host->IOBase + FRNUM, 0 );
+       
+       // Enable Interrupts
+       //PCI_WriteWord( Host->PciId, 0xC0, 0x2000 );
+       
+       LEAVE('i', 0);
+       return 0;
 }
-\r
-/**\r
- * \brief Sends a packet to a device endpoint\r
- */\r
-int UHCI_SendPacket(int ControllerId, int Length)\r
-{\r
-       //tUHCI_TD      *td = UHCI_AllocateTD();\r
-       return 0;\r
-}\r
-\r
-// === INTERNAL FUNCTIONS ===\r
-/**\r
- * \fn int UHCI_Int_InitHost(tUCHI_Controller *Host)\r
- * \brief Initialises a UHCI host controller\r
- * \param Host Pointer - Host to initialise\r
- */\r
-int UHCI_Int_InitHost(tUHCI_Controller *Host)\r
-{\r
-       ENTER("pHost", Host);\r
-       \r
-       outw( Host->IOBase + USBCMD, 4 );       // GRESET\r
-       // TODO: Wait for at least 10ms\r
-       outw( Host->IOBase + USBCMD, 0 );       // GRESET\r
-       \r
-       // Allocate Frame List\r
-       Host->FrameList = (void *) MM_AllocDMA(1, 32, &Host->PhysFrameList);    // 1 Page, 32-bit\r
-       if( !Host->FrameList ) {\r
-               Log_Warning("UHCI", "Unable to allocate frame list, aborting");\r
-               LEAVE('i', -1);\r
-               return -1;\r
-       }\r
-       LOG("Allocated frame list 0x%x (0x%x)", Host->FrameList, Host->PhysFrameList);\r
-       memsetd( Host->FrameList, 1, 1024 );    // Clear List (Disabling all entries)\r
-       \r
-       //! \todo Properly fill frame list\r
-       \r
-       // Set frame length to 1 ms\r
-       outb( Host->IOBase + SOFMOD, 64 );\r
-       \r
-       // Set Frame List Address\r
-       outd( Host->IOBase + FLBASEADD, Host->PhysFrameList );\r
-       \r
-       // Set Frame Number\r
-       outw( Host->IOBase + FRNUM, 0 );\r
-       \r
-       // Enable Interrupts\r
-       //PCI_WriteWord( Host->PciId, 0xC0, 0x2000 );\r
-       \r
-       LEAVE('i', 0);\r
-       return 0;\r
-}\r