A minor patch to remove the last isa_read/isa_write function in the
driver.
Patch is again 2.4.17
Thanks
Mike Phillips
Linux Token Ring Project
http://www.linuxtr.net
diff -urN -X /home/phillim/dontdiff linux-2.4.17-vanilla/drivers/net/tokenring/ibmtr.c linux-2.4.17-production/drivers/net/tokenring/ibmtr.c
--- linux-2.4.17-vanilla/drivers/net/tokenring/ibmtr.c Fri Nov 9 17:02:24 2001
+++ linux-2.4.17-production/drivers/net/tokenring/ibmtr.c Fri Feb 8 22:00:47 2002
@@ -236,6 +236,10 @@
printk("\n");
}
+/* We have to ioremap every checked address, because isa_readb is
+ * going away.
+ */
+
static void __devinit find_turbo_adapters(int *iolist) {
int ram_addr;
int index=0;
@@ -243,7 +247,8 @@
int found_turbo=0;
unsigned char *tchanid, ctemp;
int i,j;
-
+ void *ram_mapped ;
+
if (turbo_searched == 1) return;
turbo_searched=1;
for (ram_addr=0xC0000; ram_addr < 0xE0000; ram_addr+=0x2000) {
@@ -251,37 +256,40 @@
__u32 intf_tbl=0;
found_turbo=1;
- chanid=(CHANNEL_ID + ram_addr);
+ ram_mapped = ioremap((u32)ram_addr,0x1fff) ;
+ if (ram_mapped==NULL)
+ continue ;
+ chanid=(CHANNEL_ID + ram_mapped);
tchanid=pcchannelid;
- ctemp=isa_readb(chanid) & 0x0f;
+ ctemp=readb(chanid) & 0x0f;
if (ctemp != *tchanid) continue;
for (i=2,j=1; i<=46; i=i+2,j++) {
- if ((isa_readb(chanid+i) & 0x0f) != tchanid[j]){
+ if ((readb(chanid+i) & 0x0f) != tchanid[j]){
found_turbo=0;
break;
}
}
if (!found_turbo) continue;
- isa_writeb(0x90, ram_addr+0x1E01);
+ writeb(0x90, ram_mapped+0x1E01);
for(i=2; i<0x0f; i++) {
- isa_writeb(0x00, ram_addr+0x1E01+i);
+ writeb(0x00, ram_mapped+0x1E01+i);
}
- isa_writeb(0x00, ram_addr+0x1E01);
+ writeb(0x00, ram_mapped+0x1E01);
for(i=jiffies+TR_BUSY_INTERVAL; time_before_eq(jiffies,i););
- intf_tbl=ntohs(isa_readw(ram_addr+ACA_OFFSET+ACA_RW+WRBR_EVEN));
+ intf_tbl=ntohs(readw(ram_mapped+ACA_OFFSET+ACA_RW+WRBR_EVEN));
if (intf_tbl) {
#if IBMTR_DEBUG_MESSAGES
printk("ibmtr::find_turbo_adapters, Turbo found at "
"ram_addr %x\n",ram_addr);
printk("ibmtr::find_turbo_adapters, interface_table ");
for(i=0; i<6; i++) {
- printk("%x:",isa_readb(ram_addr+intf_tbl+i));
+ printk("%x:",readb(ram_addr+intf_tbl+i));
}
printk("\n");
#endif
- turbo_io[index]=ntohs(isa_readw(ram_addr+intf_tbl+4));
- turbo_irq[index]=isa_readb(ram_addr+intf_tbl+3);
+ turbo_io[index]=ntohs(readw(ram_mapped+intf_tbl+4));
+ turbo_irq[index]=readb(ram_mapped+intf_tbl+3);
outb(0, turbo_io[index] + ADAPTRESET);
for(i=jiffies+TR_RST_TIME;time_before_eq(jiffies,i););
outb(0, turbo_io[index] + ADAPTRESETREL);
@@ -292,7 +300,8 @@
printk("ibmtr::find_turbo_adapters, ibmtr card found at"
" %x but not a Turbo model\n",ram_addr);
#endif
- }
+ iounmap(ram_addr) ;
+ } /* for */
for(i=0; i<IBMTR_MAX_ADAPTERS; i++) {
if(!turbo_io[i]) break;
for (j=0; j<IBMTR_MAX_ADAPTERS; j++) {
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Fri Feb 15 2002 - 21:00:26 EST