patch-2.3.23 linux/drivers/net/pcmcia/pcnet_cs.c

• Lines: 91
• Date: Wed Oct 20 21:33:12 1999
• Orig file: v2.3.22/linux/drivers/net/pcmcia/pcnet_cs.c
• Orig date: Mon Oct 4 15:49:29 1999

diff -u --recursive --new-file v2.3.22/linux/drivers/net/pcmcia/pcnet_cs.c linux/drivers/net/pcmcia/pcnet_cs.c
@@ -11,7 +11,7 @@
 
     Copyright (C) 1999 David A. Hinds -- dhinds@hyper.stanford.edu
 
-    pcnet_cs.c 1.99 1999/09/15 15:33:09
+    pcnet_cs.c 1.101 1999/10/21 00:56:19
     
     The network driver code is based on Donald Becker's NE2000 code:
 
@@ -72,7 +72,7 @@
 MODULE_PARM(pc_debug, "i");
 #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
 static char *version =
-"pcnet_cs.c 1.99 1999/09/15 15:33:09 (David Hinds)";
+"pcnet_cs.c 1.101 1999/10/21 00:56:19 (David Hinds)";
 #else
 #define DEBUG(n, args...)
 #endif
@@ -477,7 +477,8 @@
 {
     struct net_device *dev = link->priv;
     unsigned char prom[32];
-    int i, j, ioaddr;
+    ioaddr_t ioaddr;
+    int i, j;
 
     /* This is lifted straight from drivers/net/ne.c */
     struct {
@@ -851,7 +852,7 @@
 
 static void set_misc_reg(struct net_device *dev)
 {
-    int nic_base = dev->base_addr;
+    ioaddr_t nic_base = dev->base_addr;
     pcnet_dev_t *info = (pcnet_dev_t *)dev;
     u_char tmp;
     
@@ -889,7 +890,7 @@
 	int i;
 	for (i = 0; i < 20; i++) {
 	    if ((inb(dev->base_addr+0x1c) & 0x01) == 0) break;
-	    current->state = TASK_INTERRUPTIBLE;
+	    __set_current_state(TASK_UNINTERRUPTIBLE);
 	    schedule_timeout(HZ/10);
 	}
     }
@@ -941,7 +942,7 @@
 
 static void pcnet_reset_8390(struct net_device *dev)
 {
-    int nic_base = dev->base_addr;
+    ioaddr_t nic_base = dev->base_addr;
     int i;
 
     ei_status.txing = ei_status.dmaing = 0;
@@ -996,7 +997,7 @@
 {
     pcnet_dev_t *info = (pcnet_dev_t *)(arg);
     struct net_device *dev = &info->dev;
-    int nic_base = dev->base_addr;
+    ioaddr_t nic_base = dev->base_addr;
 
     if (dev->start == 0) goto reschedule;
 
@@ -1027,7 +1028,7 @@
 			     struct e8390_pkt_hdr *hdr,
 			     int ring_page)
 {
-    int nic_base = dev->base_addr;
+    ioaddr_t nic_base = dev->base_addr;
 
     if (ei_status.dmaing) {
 	printk(KERN_NOTICE "%s: DMAing conflict in dma_block_input."
@@ -1059,7 +1060,7 @@
 static void dma_block_input(struct net_device *dev, int count,
 			    struct sk_buff *skb, int ring_offset)
 {
-    int nic_base = dev->base_addr;
+    ioaddr_t nic_base = dev->base_addr;
     int xfer_count = count;
     char *buf = skb->data;
 
@@ -1116,7 +1117,7 @@
 			     const unsigned char *buf,
 			     const int start_page)
 {
-    int nic_base = dev->base_addr;
+    ioaddr_t nic_base = dev->base_addr;
     pcnet_dev_t *info = (pcnet_dev_t *)dev;
 #ifdef PCMCIA_DEBUG
     int retries = 0;