cvs commit: src/sys/conf files src/sys/dev/cardbus cardbus.c cardbus_cis.c cardbusreg.h cardbusvar.h src/sys/modules/cardbus Makefile

[Warner Losh]

imp         2006-03-01 18:19:33 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/conf             files 
    sys/dev/cardbus      cardbus.c cardbus_cis.c cardbusreg.h 
                         cardbusvar.h 
    sys/modules/cardbus  Makefile 
  Log:
  Back out latest cardbus MFC.  This breaks stuff in a lot of weird and
  unknown ways.  Until that breakage is sorted out, be conservative.  I'm
  not backing this out in current so I can track down the issues.
  
  I'm also not backing out the pci parts of this commit because with the
  old cardbus code they work perfectly as far as I've been able to test.
  I'm leaving cardbus_device.c in place as well since I anticipate being
  able to reconnect it when I resolve this issue in head and cvs rm +
  cvs add on branches can be a pita...
  
  Approved by: re@ (scottl)
  
  Revision     Changes    Path
  1.1031.2.23  +1 -1      src/sys/conf/files
  1.52.2.3     +359 -54   src/sys/dev/cardbus/cardbus.c
  1.50.2.2     +140 -80   src/sys/dev/cardbus/cardbus_cis.c
  1.8.2.2      +37 -0     src/sys/dev/cardbus/cardbusreg.h
  1.11.2.2     +2 -34     src/sys/dev/cardbus/cardbusvar.h
  1.10.14.2    +1 -1      src/sys/modules/cardbus/Makefile