| /shark/trunk/drivers/bttv/bttv-driver.c |
|---|
| 1135,7 → 1135,7 |
| btv->risc_cap_even = 0; |
| bt848_set_risc_jmps(btv,-1); |
| handler_remove(btv->dev->irq); |
| //handler_remove(btv->dev->irq); |
| /* |
| * A word of warning. At this point the chip |
| 1144,7 → 1144,7 |
| * operations. |
| */ |
| tmp = btread(BT848_I2C); /* This fixes the PCI posting delay */ |
| //tmp = btread(BT848_I2C); /* This fixes the PCI posting delay */ |
| pci_write_config_dword(btv->dev,PCI_COMMAND,oldpci_command); |
| 2091,12 → 2091,7 |
| btv->dev = vmalloc_32(sizeof(struct pci_dev)); |
| /* Scan the devices connected to the PCI bus */ |
| if (pci_init() == 1) { |
| clear(); |
| pci_show(); |
| } else { |
| return -1; |
| } |
| if (pci_init() != 1) return -1; |
| bttv_num = 0; |
| /shark/trunk/drivers/svga/vgapci.c |
|---|
| 20,17 → 20,12 |
| DWORD result; |
| BYTE bus,dv; |
| printk(KERN_DEBUG "Initializing PCI BUS...\n"); |
| printk(KERN_INFO "Initializing PCI BUS...\n"); |
| memset(&graph_dev,0,sizeof(struct pci_dev)); |
| /* Scan the devices connected to the PCI bus */ |
| if (pci_init() == 1) { |
| clear(); |
| pci_show(); |
| } else { |
| return -1; |
| } |
| if (pci_init() != 1) return -1; |
| if(pci_present()) { |
| 59,13 → 54,13 |
| graph_dev.flags[i]=0x80 | (result&0xf); |
| graph_dev.len[i]=len; |
| graph_dev.mask[i]=t&~0xf; |
| printk(KERN_INFO "region%d, base=%.8x len=%d type=%d\n",\ |
| printk(KERN_INFO "region%d, base=%.8lx len=%d type=%ld\n",\ |
| i, result&(~0xf), len, result&0xf); |
| } |
| } |
| } |
| vga_init_vsync(&graph_dev); |
| //vga_init_vsync(&graph_dev); |
| } |
| /shark/trunk/drivers/svga/vga.c |
|---|
| 16,6 → 16,7 |
| #include "vgaversion.h" |
| #include "vgaio.h" |
| #include "driver.h" |
| #include "lrmi.h" |
| int __svgalib_CRT_I; /* current CRT index register address */ |
| int __svgalib_CRT_D; /* current CRT data register address */ |
| 1225,10 → 1226,8 |
| int vga_setmode(int mode,int set_chipset) |
| { |
| int modeflags=mode&0xfffff000; |
| #ifndef VM86 |
| BYTE p1,p2; |
| #endif |
| struct LRMI_regs vesa_r; |
| printk(KERN_INFO "Setmode %i from %i\n", mode, CM); |
| if(mode==-1)return vga_version; |
| 1255,28 → 1254,10 |
| if (mode == TEXT) { |
| /* Returning to textmode. */ |
| cli(); |
| X_REGS16 inregs, outregs; |
| X_SREGS16 sregs; |
| inregs.x.ax = 0x03; |
| #ifndef VM86 |
| p1 = inp(0x21); |
| p2 = inp(0xA1); |
| outp(0x21,0xFF); |
| outp(0xA1,0xFF); |
| X_callBIOS(0x10, &inregs, &outregs, &sregs); |
| outp(0x21,p1); |
| outp(0xA1,p2); |
| #else |
| vm86_callBIOS(0x10, &inregs, &outregs, &sregs); |
| #endif |
| vesa_r.eax = 0x03; |
| __svgalib_LRMI_int(0x10,&vesa_r); |
| if (SVGAMODE(prv_mode)) vga_setpage(0); |
| sti(); |
| } else { |
| /* Setting a graphics mode. */ |
| /shark/trunk/drivers/pci/pci.c |
|---|
| 13,6 → 13,8 |
| static int ndev = 0; |
| static struct pci_des pci_devs[N_MAX_DEVS]; |
| static int initialized = 0; |
| /* scan the bus to find all the connected devices */ |
| int scan_bus(struct pci_des *p_des) |
| { |
| 141,9 → 143,16 |
| int pci_init(void) |
| { |
| if (initialized == 1) return 1; |
| if (pcibios_init() == -1) { |
| return -1; |
| } |
| ndev = scan_bus(pci_devs); |
| initialized = 1; |
| return 1; |
| } |