2005-05-04 Jennifer Averett <jennifer.averett@oarcorp.com>

* pci/pcibios.c, pci/pcibios.h: Corrected spacing
	Name modifications for a generic PCI interface
	Added wrapper routines for pci read/write configuration data

c/src/lib/libbsp/i386/shared/ChangeLog

@@ -1,3 +1,9 @@
+2005-05-04      Jennifer Averett <jennifer.averett@oarcorp.com>
+
+        * pci/pcibios.c, pci/pcibios.h: Corrected spacing
+        Name modifications for a generic PCI interface      
+        Added wrapper routines for pci read/write configuration data
+
 2005-05-03      Jennifer Averett <jennifer.averett@oarcorp.com>
 
         * comm/tty_drv.c: Modified to support addition of parameter to ISRs.

c/src/lib/libbsp/i386/shared/pci/pcibios.c

@@ -46,35 +46,31 @@ pci_initialize(void)
   pcibInitialized = 0;
 
   /* First, we have to look for BIOS-32 */
-  for(ucp=(unsigned char *)0xE0000; ucp < (unsigned char *)0xFFFFF; ucp+=0x10)
+  for (ucp = (unsigned char *)0xE0000;
-    {
+       ucp < (unsigned char *)0xFFFFF;
-      if(memcmp(ucp, "_32_", 4) != 0)
+       ucp += 0x10) {
-	{
+    if (memcmp(ucp, "_32_", 4) != 0) {
       continue;
     }
 
       /* Got signature, check length  */
-      if(*(ucp + 9) != 1)
+    if (*(ucp + 9) != 1) {
-	{
       continue;
     }
 
     /* Verify checksum */
     sum = 0;
-      for(i=0; i<16; i++)
+    for (i=0; i<16; i++) {
-	{
       sum += *(ucp+i);
     }
 
-      if(sum == 0)
+    if (sum == 0) {
-	{
       /* found */
       break;
     }
   }
 
-  if(ucp >= (unsigned char *)0xFFFFF)
+  if (ucp >= (unsigned char *)0xFFFFF) {
-    {
     /* BIOS-32 not found */
     return PCIB_ERR_NOTPRESENT;
   }
@@ -96,8 +92,7 @@ pci_initialize(void)
   asm ("    movl %edx, pcibExchg+12");
   asm ("    popa");
 
-  if((pcibExchg[0] & 0xff) != 0)
+  if ((pcibExchg[0] & 0xff) != 0) {
-    {
     /* Not found */
     return PCIB_ERR_NOTPRESENT;
   }
@@ -120,14 +115,12 @@ pci_initialize(void)
   asm("    movl %edx, pcibExchg+12");
   asm("    popa");
 
-  if((pcibExchg[0] & 0xff00) != 0)
+  if ((pcibExchg[0] & 0xff00) != 0) {
-    {
     /* Not found */
     return PCIB_ERR_NOTPRESENT;
   }
 
-  if(pcibExchg[3] != 0x20494350)
+  if (pcibExchg[3] != 0x20494350) {
-    {
     /* Signature does not match */
     return PCIB_ERR_NOTPRESENT;
   }
@@ -145,8 +138,7 @@ pci_initialize(void)
 int
 pcib_find_by_devid(int vendorId, int devId, int idx, int *sig)
 {
-  if(!pcibInitialized)
+  if (!pcibInitialized) {
-    {
     return PCIB_ERR_UNINITIALIZED;
   }
 
@@ -201,8 +193,7 @@ pci_find_device(
 int
 pcib_find_by_class(int classCode, int idx, int *sig)
 {
-  if(!pcibInitialized)
+  if (!pcibInitialized) {
-    {
     return PCIB_ERR_UNINITIALIZED;
   }
 
@@ -222,8 +213,7 @@ pcib_find_by_class(int classCode, int idx, int *sig)
   asm("    movl %ebx, pcibExchg+4");
   asm("    popa");
 
-  if((pcibExchg[0] & 0xff00) != 0)
+  if ((pcibExchg[0] & 0xff00) != 0) {
-    {
     return pcib_convert_err((pcibExchg[0] >> 8) & 0xff);
   }
 
@@ -237,10 +227,9 @@ pcib_find_by_class(int classCode, int idx, int *sig)
 static unsigned8 ucBusCount = 0xff;
 
 unsigned char
-BusCountPCI()
+pci_bus_count()
-{
-   if( ucBusCount == 0xff )
 {
+  if ( ucBusCount == 0xff ) {
     unsigned char bus;
     unsigned char dev;
     unsigned char hd = 0;
@@ -265,14 +254,13 @@ BusCountPCI()
            }
         }
       }
-         
     }
 
     if ( ucBusCount == 0 ) {
-         printk("BusCountPCI() found 0 busses, assuming 1\n");
+      printk("pci_bus_count() found 0 busses, assuming 1\n");
       ucBusCount = 1;
     } else if ( ucBusCount == 0xff ) {
-         printk("BusCountPCI() found 0xff busses, assuming 1\n");
+      printk("pci_bus_count() found 0xff busses, assuming 1\n");
       ucBusCount = 1;
     }
   }
@@ -293,10 +281,8 @@ BSP_pciFindDevice( unsigned short vendorid, unsigned short deviceid,
   unsigned char fun;
   unsigned char hd = 0;
 
-   for (bus=0; bus<BusCountPCI(); bus++) 
+  for (bus=0; bus<pci_bus_count(); bus++) {
-   {
+    for (dev=0; dev<PCI_MAX_DEVICES; dev++) {
-      for (dev=0; dev<PCI_MAX_DEVICES; dev++) 
-      {
       sig = PCIB_DEVSIG_MAKE(bus,dev,0);
 
       /* pci_read_config_byte(bus,dev,0, PCI_HEADER_TYPE, &hd); */
@@ -338,17 +324,13 @@ BSP_pciFindDevice( unsigned short vendorid, unsigned short deviceid,
   return -1;
 }
 
-
-  
-
 /*
  * Generate Special Cycle
  */
 int
 pcib_special_cycle(int busNo, int data)
 {
-  if(!pcibInitialized)
+  if (!pcibInitialized) {
-    {
     return PCIB_ERR_UNINITIALIZED;
   }
 
@@ -378,8 +360,7 @@ pcib_special_cycle(int busNo, int data)
 int
 pcib_conf_read8(int sig, int off, unsigned char *data)
 {
-  if(!pcibInitialized)
+  if (!pcibInitialized) {
-    {
     return PCIB_ERR_UNINITIALIZED;
   }
 
@@ -399,8 +380,7 @@ pcib_conf_read8(int sig, int off, unsigned char *data)
   asm("    movl %ecx, pcibExchg+4");
   asm("    popa");
 
-  if((pcibExchg[0] & 0xff00) != 0)
+  if ((pcibExchg[0] & 0xff00) != 0) {
-    {
     return pcib_convert_err((pcibExchg[0] >> 8) & 0xff);
   }
 
@@ -416,8 +396,7 @@ pcib_conf_read8(int sig, int off, unsigned char *data)
 int
 pcib_conf_read16(int sig, int off, unsigned short *data)
 {
-  if(!pcibInitialized)
+  if (!pcibInitialized) {
-    {
     return PCIB_ERR_UNINITIALIZED;
   }
 
@@ -437,8 +416,7 @@ pcib_conf_read16(int sig, int off, unsigned short *data)
   asm("    movl %ecx, pcibExchg+4");
   asm("    popa");
 
-  if((pcibExchg[0] & 0xff00) != 0)
+  if ((pcibExchg[0] & 0xff00) != 0) {
-    {
     return pcib_convert_err((pcibExchg[0] >> 8) & 0xff);
   }
 
@@ -454,8 +432,7 @@ pcib_conf_read16(int sig, int off, unsigned short *data)
 int
 pcib_conf_read32(int sig, int off, unsigned int *data)
 {
-  if(!pcibInitialized)
+  if (!pcibInitialized) {
-    {
     return PCIB_ERR_UNINITIALIZED;
   }
 
@@ -475,8 +452,7 @@ pcib_conf_read32(int sig, int off, unsigned int *data)
   asm("    movl %ecx, pcibExchg+4");
   asm("    popa");
 
-  if((pcibExchg[0] & 0xff00) != 0)
+  if ((pcibExchg[0] & 0xff00) != 0) {
-    {
     return pcib_convert_err((pcibExchg[0] >> 8) & 0xff);
   }
 
@@ -492,8 +468,7 @@ pcib_conf_read32(int sig, int off, unsigned int *data)
 int
 pcib_conf_write8(int sig, int off, unsigned int data)
 {
-  if(!pcibInitialized)
+  if (!pcibInitialized) {
-    {
     return PCIB_ERR_UNINITIALIZED;
   }
 
@@ -523,8 +498,7 @@ pcib_conf_write8(int sig, int off, unsigned int data)
 int
 pcib_conf_write16(int sig, int off, unsigned int data)
 {
-  if(!pcibInitialized)
+  if (!pcibInitialized) {
-    {
     return PCIB_ERR_UNINITIALIZED;
   }
 
@@ -556,8 +530,7 @@ pcib_conf_write16(int sig, int off, unsigned int data)
 int
 pcib_conf_write32(int sig, int off, unsigned int data)
 {
-  if(!pcibInitialized)
+  if (!pcibInitialized){
-    {
       return PCIB_ERR_UNINITIALIZED;
   }
 
@@ -585,8 +558,7 @@ pcib_conf_write32(int sig, int off, unsigned int data)
 static int
 pcib_convert_err(int err)
 {
-  switch(err & 0xff)
+  switch(err & 0xff){
-    {
     case 0:
       return PCIB_ERR_SUCCESS;
     case 0x81:
@@ -603,12 +575,113 @@ pcib_convert_err(int err)
   return PCIB_ERR_NOFUNC;
 }
 
+static int
+indirect_pci_read_config_byte(
+  unsigned char bus,
+  unsigned char slot,
+  unsigned char fun,
+  unsigned char offset,
+  unsigned char *val
+) 
+{
+  int sig;
 
+  sig = PCIB_DEVSIG_MAKE(bus,slot,fun);
+  pcib_conf_read8(sig, offset, val);
+  return PCIBIOS_SUCCESSFUL;
+}
 
+static int
+indirect_pci_read_config_word(
+  unsigned char bus,
+  unsigned char slot,
+  unsigned char fun,
+  unsigned char offset,
+  unsigned short *val
+) 
+{
+  int sig;
 
+  sig = PCIB_DEVSIG_MAKE(bus,slot,fun);
+  pcib_conf_read16(sig, offset, val);
+  return PCIBIOS_SUCCESSFUL;
+}
 
+static int
+indirect_pci_read_config_dword(
+  unsigned char bus,
+  unsigned char slot,
+  unsigned char fun,
+  unsigned char offset,
+  unsigned int *val
+) 
+{
+  int sig;
 
+  sig = PCIB_DEVSIG_MAKE(bus,slot,fun);
+  pcib_conf_read32(sig, offset, val);
+  return PCIBIOS_SUCCESSFUL;
+}
 
+static int
+indirect_pci_write_config_byte(
+  unsigned char bus,
+  unsigned char slot,
+  unsigned char fun,
+  unsigned char offset,
+  unsigned char val
+) 
+{
+  int sig;
 
+  sig = PCIB_DEVSIG_MAKE(bus,slot,fun);
+  pcib_conf_write8(sig, offset, val);
+  return PCIBIOS_SUCCESSFUL;
+}
 
+static int
+indirect_pci_write_config_word(
+  unsigned char bus,
+  unsigned char slot,
+  unsigned char fun,
+  unsigned char offset,
+  unsigned short val
+) 
+{
+  int sig;
 
+  sig = PCIB_DEVSIG_MAKE(bus,slot,fun);
+  pcib_conf_write16(sig, offset, val);
+  return PCIBIOS_SUCCESSFUL;
+}
+
+static int
+indirect_pci_write_config_dword(
+  unsigned char bus,
+  unsigned char slot,
+  unsigned char fun,
+  unsigned char offset,
+  unsigned int val
+) 
+{
+  int sig;
+
+  sig = PCIB_DEVSIG_MAKE(bus,slot,fun);
+  pcib_conf_write32(sig, offset, val);
+  return PCIBIOS_SUCCESSFUL;
+}
+
+const pci_config_access_functions pci_indirect_functions = {
+  indirect_pci_read_config_byte,
+  indirect_pci_read_config_word,
+  indirect_pci_read_config_dword,
+  indirect_pci_write_config_byte,
+  indirect_pci_write_config_word,
+  indirect_pci_write_config_dword
+};
+
+pci_config BSP_pci_configuration = {
+  (volatile unsigned char*)0,
+  (volatile unsigned char*)0,
+  &pci_indirect_functions
+};

c/src/lib/libbsp/i386/shared/pci/pcibios.h

@@ -37,7 +37,7 @@ int pcib_conf_write16(int sig, int off, unsigned int data);
 int pcib_conf_write32(int sig, int off, unsigned int data);
 
 int
-BSP_pciFindDevice( unsigned short vendorid, unsigned short deviceid,
+pci_find_device( unsigned short vendorid, unsigned short deviceid,
                    int instance, int *pbus, int *pdev, int *pfun );
 
 #ifdef __cplusplus