| /shark/trunk/drivers/newpci/pci-driver.c |
|---|
| 34,6 → 34,7 |
| (id->subdevice == PCI_ANY_ID || id->subdevice == dev->subsystem_device) && |
| !((id->class ^ dev->class) & id->class_mask)) |
| return id; |
| return NULL; |
| } |
| /shark/trunk/drivers/newpci/pci.c |
|---|
| 1,5 → 1,5 |
| /* |
| * $Id: pci.c,v 1.5 2004-02-23 14:23:57 giacomo Exp $ |
| * $Id: pci.c,v 1.6 2004-02-26 16:57:35 giacomo Exp $ |
| * |
| * PCI Bus Services, see include/linux/pci.h for further explanation. |
| * |
| 724,10 → 724,6 |
| pci_fixup_device(PCI_FIXUP_FINAL, dev); |
| } |
| dev = pci_find_class(PCI_CLASS_NETWORK_ETHERNET << 8,NULL); |
| printk("Find %x\n",(int)(dev)); |
| return 0; |
| } |
| /shark/trunk/drivers/fb/riva/fbdev.c |
|---|
| 63,7 → 63,7 |
| * |
| * ------------------------------------------------------------------------- */ |
| #undef RIVAFBDEBUG |
| #define RIVAFBDEBUG |
| #ifdef RIVAFBDEBUG |
| #define DPRINTK(fmt, args...) printk(KERN_DEBUG "%s: " fmt, __FUNCTION__ , ## args) |
| #else |
| 124,6 → 124,7 |
| CH_GEFORCE2_GTS2, |
| CH_GEFORCE2_ULTRA, |
| CH_QUADRO2_PRO, |
| CH_TEST, |
| CH_GEFORCE4_MX_460, |
| CH_GEFORCE4_MX_440, |
| CH_GEFORCE4_MX_420, |
| 171,6 → 172,7 |
| { "GeForce2-GTS", NV_ARCH_10 }, |
| { "GeForce2-ULTRA", NV_ARCH_10 }, |
| { "Quadro2-PRO", NV_ARCH_10 }, |
| { "TEST",NV_ARCH_20 }, |
| { "GeForce4-MX-460", NV_ARCH_20 }, |
| { "GeForce4-MX-440", NV_ARCH_20 }, |
| { "GeForce4-MX-420", NV_ARCH_20 }, |
| 238,6 → 240,8 |
| PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_GEFORCE4_MX_440 }, |
| { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420, |
| PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_GEFORCE4_MX_420 }, |
| { PCI_VENDOR_ID_NVIDIA, 0x0182, |
| PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_TEST }, |
| { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_440_GO, |
| PCI_ANY_ID, PCI_ANY_ID, 0, 0, CH_GEFORCE4_440_GO }, |
| { PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_420_GO, |
| /shark/trunk/drivers/fb/shark_fb26.c |
|---|
| 20,7 → 20,7 |
| #include <kernel/kern.h> |
| extern int fbmem_init(void); |
| extern void fbmem_init(void); |
| extern int fb_open_inode(int num); |
| extern int fb_close_inode(int num); |
| extern int fb_set_mode_inode(int num, int wx, int wy, int bpp); |
| 28,10 → 28,7 |
| /* Init the Linux PCI 2.6 Driver */ |
| int FB26_init() { |
| if (fbmem_init()) { |
| printk("FB ERROR: Cannot init the FrameBuffer driver\n"); |
| return -1; |
| } |
| fbmem_init(); |
| return 0; |
| /shark/trunk/drivers/linuxc26/linuxcomp.c |
|---|
| 340,7 → 340,7 |
| unsigned long __copy_to_user_ll(void __user *to, const void *from, unsigned long n) { |
| memcpy(to,from,n); |
| return n; |
| return 0; |
| } |
| 347,7 → 347,7 |
| unsigned long __copy_from_user_ll(void *to, const void __user *from, unsigned long n) { |
| memcpy(to,from,n); |
| return n; |
| return 0; |
| } |
| /shark/trunk/drivers/linuxc26/include/linux/pci_ids.h |
|---|
| 1056,6 → 1056,7 |
| #define PCI_DEVICE_ID_NVIDIA_QUADRO4_200 0x017A |
| #define PCI_DEVICE_ID_NVIDIA_QUADRO4_550XGL 0x017B |
| #define PCI_DEVICE_ID_NVIDIA_QUADRO4_500_GOGL 0x017C |
| #define PCI_DEVICE_ID_NVIDIA_ADDED 0x0182 |
| #define PCI_DEVICE_ID_NVIDIA_IGEFORCE2 0x01a0 |
| #define PCI_DEVICE_ID_NVIDIA_NFORCE 0x01a4 |
| #define PCI_DEVICE_ID_NVIDIA_NFORCE_IDE 0x01bc |
| /shark/trunk/drivers/linuxc26/bus.c |
|---|
| 263,6 → 263,7 |
| static int bus_match(struct device * dev, struct device_driver * drv) |
| { |
| int error = -ENODEV; |
| if (dev->bus->match(dev,drv)) { |
| dev->driver = drv; |
| if (drv->probe) { |