Ticket #832: pcx86-fixes.diff

Index: c/src/lib/libbsp/i386/pc386/startup/ldsegs.S
===================================================================
RCS file: /afs/slac/g/spear/cvsrep/rtems/src-20030128/c/src/lib/libbsp/i386/pc386/startup/ldsegs.S,v
retrieving revision 1.1.1.4
retrieving revision 1.2
diff -c -r1.1.1.4 -r1.2
*** c/src/lib/libbsp/i386/pc386/startup/ldsegs.S        27 Feb 2004 02:56:16 -0000      1.1.1.4
--- c/src/lib/libbsp/i386/pc386/startup/ldsegs.S        4 Oct 2005 03:24:00 -0000       1.2
***************
*** 187,192 ****
--- 187,193 ----
  | GDT itself
  +--------------------------------------------------------------------------*/
  
+ BEGIN_DATA
        .p2align 4
                
        PUBLIC (_Global_descriptor_table)
***************
*** 216,222 ****
  /*---------------------------------------------------------------------------+
  | IDT itself
  +---------------------------------------------------------------------------*/
- BEGIN_DATA
        .p2align 4
        
        PUBLIC(Interrupt_descriptor_table)
--- 217,222 ----
***************
*** 224,241 ****
        .rept 256
        .word 0,0,0,0
        .endr
- END_DATA
                
  /*---------------------------------------------------------------------------+
  | Descriptor of IDT
  +--------------------------------------------------------------------------*/
! BEGIN_CODE
        .p2align 4
  SYM(idtdesc): 
        .word  (256*8 - 1)
        .long  SYM (Interrupt_descriptor_table)
        
! END_CODE
  
      .section .m_hdr
        .long 0x1BADB002
--- 224,240 ----
        .rept 256
        .word 0,0,0,0
        .endr
                
  /*---------------------------------------------------------------------------+
  | Descriptor of IDT
  +--------------------------------------------------------------------------*/
! 
        .p2align 4
  SYM(idtdesc): 
        .word  (256*8 - 1)
        .long  SYM (Interrupt_descriptor_table)
        
! END_DATA
  
      .section .m_hdr
        .long 0x1BADB002
Index: c/src/lib/libbsp/i386/shared/pci/pcibios.c
===================================================================
RCS file: /afs/slac/g/spear/cvsrep/rtems/src-20030128/c/src/lib/libbsp/i386/shared/pci/pcibios.c,v
retrieving revision 1.1.1.4
retrieving revision 1.3
diff -c -r1.1.1.4 -r1.3
*** c/src/lib/libbsp/i386/shared/pci/pcibios.c  21 Oct 2004 18:14:39 -0000      1.1.1.4
--- c/src/lib/libbsp/i386/shared/pci/pcibios.c  21 Oct 2004 18:39:30 -0000      1.3
***************
*** 281,334 ****
  BSP_pciFindDevice( unsigned short vendorid, unsigned short deviceid,
                     int instance, int *pbus, int *pdev, int *pfun )
  {
!    int sig;
!    unsigned int d;
!    unsigned short s;
!    unsigned char bus,dev,fun,hd;
! 
!    for (bus=0; bus<BusCountPCI(); bus++) 
!    {
!       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); */
!          pcib_conf_read8(sig, 0xe, &hd); 
! 
!          hd = (hd & PCI_MULTI_FUNCTION ? PCI_MAX_FUNCTIONS : 1);
! 
!          for (fun=0; fun<hd; fun++) {
!             /* 
!              * The last devfn id/slot is special; must skip it
!              */
!             if( PCI_MAX_DEVICES-1 == dev && PCI_MAX_FUNCTIONS-1 == fun )
!                break;
! 
!             /*pci_read_config_dword(bus,dev,fun,PCI_VENDOR_ID,&d); */
!             pcib_conf_read32(sig, 0, &d); 
!             if( d == -1 )
!                continue;
! #ifdef PCI_DEBUG
!             printk("BSP_pciFindDevice: found 0x%08x at %d/%d/%d\n",d,bus,dev,fun);
! #endif
!             /* pci_read_config_word(bus,dev,fun,PCI_VENDOR_ID,&s); */
!             pcib_conf_read16(sig, 0, &s); 
!             if (vendorid != s)
!                continue;
! 
!             /* pci_read_config_word(bus,dev,fun,PCI_DEVICE_ID,&s); */
!             pcib_conf_read16(sig, 0x2, &s); 
!             if (deviceid == s) {
!                if (instance--) continue;
!                *pbus=bus; 
!                *pdev=dev; 
!                *pfun=fun;
!                return 0;
!             }
!          }
!       }
     }
!    return -1;
  }
  
  
--- 281,297 ----
  BSP_pciFindDevice( unsigned short vendorid, unsigned short deviceid,
                     int instance, int *pbus, int *pdev, int *pfun )
  {
!    int sig, rval;
! 
!    rval = pcib_find_by_devid(vendorid, deviceid, instance, &sig);
! 
!    if ( PCIB_ERR_SUCCESS == rval ) {
!               *pbus = PCIB_DEVSIG_BUS(sig);
!               *pdev = PCIB_DEVSIG_DEV(sig);
!               *pfun = PCIB_DEVSIG_FUNC(sig);
     }
! 
!    return rval;
  }