]> bbs.cooldavid.org Git - net-next-2.6.git/blobdiff - drivers/pnp/isapnp/core.c
[ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz
[net-next-2.6.git] / drivers / pnp / isapnp / core.c
index a0b158704ca1f8f5eb5982f55477c96586d5692f..2c925b7cd93e356fab3af1cfd3689199594904ec 100644 (file)
@@ -1,6 +1,6 @@
 /*
  *  ISA Plug & Play support
- *  Copyright (c) by Jaroslav Kysela <perex@suse.cz>
+ *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *
  *
  *   This program is free software; you can redistribute it and/or modify
 #if 0
 #define ISAPNP_REGION_OK
 #endif
-#if 0
-#define ISAPNP_DEBUG
-#endif
 
-int isapnp_disable;                    /* Disable ISA PnP */
-static int isapnp_rdp;                 /* Read Data Port */
-static int isapnp_reset = 1;           /* reset all PnP cards (deactivate) */
-static int isapnp_verbose = 1;         /* verbose mode */
+int isapnp_disable;            /* Disable ISA PnP */
+static int isapnp_rdp;         /* Read Data Port */
+static int isapnp_reset = 1;   /* reset all PnP cards (deactivate) */
+static int isapnp_verbose = 1; /* verbose mode */
 
-MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>");
+MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
 MODULE_DESCRIPTION("Generic ISA Plug & Play support");
 module_param(isapnp_disable, int, 0);
 MODULE_PARM_DESC(isapnp_disable, "ISA Plug & Play disable");
@@ -93,7 +90,6 @@ MODULE_LICENSE("GPL");
 
 static unsigned char isapnp_checksum_value;
 static DEFINE_MUTEX(isapnp_cfg_mutex);
-static int isapnp_detected;
 static int isapnp_csn_count;
 
 /* some prototypes */
@@ -126,7 +122,7 @@ static unsigned short isapnp_read_word(unsigned char idx)
        unsigned short val;
 
        val = isapnp_read_byte(idx);
-       val = (val << 8) + isapnp_read_byte(idx+1);
+       val = (val << 8) + isapnp_read_byte(idx + 1);
        return val;
 }
 
@@ -139,7 +135,7 @@ void isapnp_write_byte(unsigned char idx, unsigned char val)
 static void isapnp_write_word(unsigned char idx, unsigned short val)
 {
        isapnp_write_byte(idx, val >> 8);
-       isapnp_write_byte(idx+1, val);
+       isapnp_write_byte(idx + 1, val);
 }
 
 static void isapnp_key(void)
@@ -193,7 +189,7 @@ static void isapnp_deactivate(unsigned char logdev)
 static void __init isapnp_peek(unsigned char *data, int bytes)
 {
        int i, j;
-       unsigned char d=0;
+       unsigned char d = 0;
 
        for (i = 1; i <= bytes; i++) {
                for (j = 0; j < 20; j++) {
@@ -220,19 +216,18 @@ static int isapnp_next_rdp(void)
 {
        int rdp = isapnp_rdp;
        static int old_rdp = 0;
-       
-       if(old_rdp)
-       {
+
+       if (old_rdp) {
                release_region(old_rdp, 1);
                old_rdp = 0;
        }
        while (rdp <= 0x3ff) {
                /*
-                *      We cannot use NE2000 probe spaces for ISAPnP or we
-                *      will lock up machines.
+                *      We cannot use NE2000 probe spaces for ISAPnP or we
+                *      will lock up machines.
                 */
-               if ((rdp < 0x280 || rdp >  0x380) && request_region(rdp, 1, "ISAPnP"))
-               {
+               if ((rdp < 0x280 || rdp > 0x380)
+                   && request_region(rdp, 1, "ISAPnP")) {
                        isapnp_rdp = rdp;
                        old_rdp = rdp;
                        return 0;
@@ -253,7 +248,6 @@ static inline void isapnp_set_rdp(void)
  *     Perform an isolation. The port selection code now tries to avoid
  *     "dangerous to read" ports.
  */
-
 static int __init isapnp_isolate_rdp_select(void)
 {
        isapnp_wait();
@@ -282,7 +276,6 @@ static int __init isapnp_isolate_rdp_select(void)
 /*
  *  Isolate (assign uniqued CSN) to all ISA PnP devices.
  */
-
 static int __init isapnp_isolate(void)
 {
        unsigned char checksum = 0x6a;
@@ -305,7 +298,9 @@ static int __init isapnp_isolate(void)
                        udelay(250);
                        if (data == 0x55aa)
                                bit = 0x01;
-                       checksum = ((((checksum ^ (checksum >> 1)) & 0x01) ^ bit) << 7) | (checksum >> 1);
+                       checksum =
+                           ((((checksum ^ (checksum >> 1)) & 0x01) ^ bit) << 7)
+                           | (checksum >> 1);
                        bit = 0x00;
                }
                for (i = 65; i <= 72; i++) {
@@ -336,7 +331,7 @@ static int __init isapnp_isolate(void)
                } else if (iteration > 1) {
                        break;
                }
-             __next:
+__next:
                if (csn == 255)
                        break;
                checksum = 0x6a;
@@ -351,13 +346,12 @@ static int __init isapnp_isolate(void)
 /*
  *  Read one tag from stream.
  */
-
 static int __init isapnp_read_tag(unsigned char *type, unsigned short *size)
 {
        unsigned char tag, tmp[2];
 
        isapnp_peek(&tag, 1);
-       if (tag == 0)                           /* invalid tag */
+       if (tag == 0)           /* invalid tag */
                return -1;
        if (tag & 0x80) {       /* large item */
                *type = tag;
@@ -368,10 +362,9 @@ static int __init isapnp_read_tag(unsigned char *type, unsigned short *size)
                *size = tag & 0x07;
        }
 #if 0
-       printk(KERN_DEBUG "tag = 0x%x, type = 0x%x, size = %i\n", tag, *type, *size);
+       printk(KERN_DEBUG "tag = 0x%x, type = 0x%x, size = %i\n", tag, *type,
+              *size);
 #endif
-       if (type == 0)                          /* wrong type */
-               return -1;
        if (*type == 0xff && *size == 0xffff)   /* probably invalid data */
                return -1;
        return 0;
@@ -380,7 +373,6 @@ static int __init isapnp_read_tag(unsigned char *type, unsigned short *size)
 /*
  *  Skip specified number of bytes from stream.
  */
-
 static void __init isapnp_skip_bytes(int count)
 {
        isapnp_peek(NULL, count);
@@ -389,31 +381,30 @@ static void __init isapnp_skip_bytes(int count)
 /*
  *  Parse EISA id.
  */
-
-static void isapnp_parse_id(struct pnp_dev * dev, unsigned short vendor, unsigned short device)
+static void isapnp_parse_id(struct pnp_dev *dev, unsigned short vendor,
+                           unsigned short device)
 {
-       struct pnp_id * id;
+       struct pnp_id *id;
+
        if (!dev)
                return;
        id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
        if (!id)
                return;
        sprintf(id->id, "%c%c%c%x%x%x%x",
-                       'A' + ((vendor >> 2) & 0x3f) - 1,
-                       'A' + (((vendor & 3) << 3) | ((vendor >> 13) & 7)) - 1,
-                       'A' + ((vendor >> 8) & 0x1f) - 1,
-                       (device >> 4) & 0x0f,
-                       device & 0x0f,
-                       (device >> 12) & 0x0f,
-                       (device >> 8) & 0x0f);
+               'A' + ((vendor >> 2) & 0x3f) - 1,
+               'A' + (((vendor & 3) << 3) | ((vendor >> 13) & 7)) - 1,
+               'A' + ((vendor >> 8) & 0x1f) - 1,
+               (device >> 4) & 0x0f,
+               device & 0x0f, (device >> 12) & 0x0f, (device >> 8) & 0x0f);
        pnp_add_id(id, dev);
 }
 
 /*
  *  Parse logical device tag.
  */
-
-static struct pnp_dev * __init isapnp_parse_device(struct pnp_card *card, int size, int number)
+static struct pnp_dev *__init isapnp_parse_device(struct pnp_card *card,
+                                                 int size, int number)
 {
        unsigned char tmp[6];
        struct pnp_dev *dev;
@@ -437,13 +428,11 @@ static struct pnp_dev * __init isapnp_parse_device(struct pnp_card *card, int si
        return dev;
 }
 
-
 /*
  *  Add IRQ resource to resources list.
  */
-
 static void __init isapnp_parse_irq_resource(struct pnp_option *option,
-                                              int size)
+                                            int size)
 {
        unsigned char tmp[3];
        struct pnp_irq *irq;
@@ -460,15 +449,13 @@ static void __init isapnp_parse_irq_resource(struct pnp_option *option,
        else
                irq->flags = IORESOURCE_IRQ_HIGHEDGE;
        pnp_register_irq_resource(option, irq);
-       return;
 }
 
 /*
  *  Add DMA resource to resources list.
  */
-
 static void __init isapnp_parse_dma_resource(struct pnp_option *option,
-                                              int size)
+                                            int size)
 {
        unsigned char tmp[2];
        struct pnp_dma *dma;
@@ -480,15 +467,13 @@ static void __init isapnp_parse_dma_resource(struct pnp_option *option,
        dma->map = tmp[0];
        dma->flags = tmp[1];
        pnp_register_dma_resource(option, dma);
-       return;
 }
 
 /*
  *  Add port resource to resources list.
  */
-
 static void __init isapnp_parse_port_resource(struct pnp_option *option,
-                                               int size)
+                                             int size)
 {
        unsigned char tmp[7];
        struct pnp_port *port;
@@ -502,16 +487,14 @@ static void __init isapnp_parse_port_resource(struct pnp_option *option,
        port->align = tmp[5];
        port->size = tmp[6];
        port->flags = tmp[0] ? PNP_PORT_FLAG_16BITADDR : 0;
-       pnp_register_port_resource(option,port);
-       return;
+       pnp_register_port_resource(option, port);
 }
 
 /*
  *  Add fixed port resource to resources list.
  */
-
 static void __init isapnp_parse_fixed_port_resource(struct pnp_option *option,
-                                                     int size)
+                                                   int size)
 {
        unsigned char tmp[3];
        struct pnp_port *port;
@@ -524,16 +507,14 @@ static void __init isapnp_parse_fixed_port_resource(struct pnp_option *option,
        port->size = tmp[2];
        port->align = 0;
        port->flags = PNP_PORT_FLAG_FIXED;
-       pnp_register_port_resource(option,port);
-       return;
+       pnp_register_port_resource(option, port);
 }
 
 /*
  *  Add memory resource to resources list.
  */
-
 static void __init isapnp_parse_mem_resource(struct pnp_option *option,
-                                              int size)
+                                            int size)
 {
        unsigned char tmp[9];
        struct pnp_mem *mem;
@@ -547,16 +528,14 @@ static void __init isapnp_parse_mem_resource(struct pnp_option *option,
        mem->align = (tmp[6] << 8) | tmp[5];
        mem->size = ((tmp[8] << 8) | tmp[7]) << 8;
        mem->flags = tmp[0];
-       pnp_register_mem_resource(option,mem);
-       return;
+       pnp_register_mem_resource(option, mem);
 }
 
 /*
  *  Add 32-bit memory resource to resources list.
  */
-
 static void __init isapnp_parse_mem32_resource(struct pnp_option *option,
-                                                int size)
+                                              int size)
 {
        unsigned char tmp[17];
        struct pnp_mem *mem;
@@ -567,18 +546,19 @@ static void __init isapnp_parse_mem32_resource(struct pnp_option *option,
                return;
        mem->min = (tmp[4] << 24) | (tmp[3] << 16) | (tmp[2] << 8) | tmp[1];
        mem->max = (tmp[8] << 24) | (tmp[7] << 16) | (tmp[6] << 8) | tmp[5];
-       mem->align = (tmp[12] << 24) | (tmp[11] << 16) | (tmp[10] << 8) | tmp[9];
-       mem->size = (tmp[16] << 24) | (tmp[15] << 16) | (tmp[14] << 8) | tmp[13];
+       mem->align =
+           (tmp[12] << 24) | (tmp[11] << 16) | (tmp[10] << 8) | tmp[9];
+       mem->size =
+           (tmp[16] << 24) | (tmp[15] << 16) | (tmp[14] << 8) | tmp[13];
        mem->flags = tmp[0];
-       pnp_register_mem_resource(option,mem);
+       pnp_register_mem_resource(option, mem);
 }
 
 /*
  *  Add 32-bit fixed memory resource to resources list.
  */
-
 static void __init isapnp_parse_fixed_mem32_resource(struct pnp_option *option,
-                                                      int size)
+                                                    int size)
 {
        unsigned char tmp[9];
        struct pnp_mem *mem;
@@ -587,28 +567,29 @@ static void __init isapnp_parse_fixed_mem32_resource(struct pnp_option *option,
        mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
        if (!mem)
                return;
-       mem->min = mem->max = (tmp[4] << 24) | (tmp[3] << 16) | (tmp[2] << 8) | tmp[1];
+       mem->min = mem->max =
+           (tmp[4] << 24) | (tmp[3] << 16) | (tmp[2] << 8) | tmp[1];
        mem->size = (tmp[8] << 24) | (tmp[7] << 16) | (tmp[6] << 8) | tmp[5];
        mem->align = 0;
        mem->flags = tmp[0];
-       pnp_register_mem_resource(option,mem);
+       pnp_register_mem_resource(option, mem);
 }
 
 /*
  *  Parse card name for ISA PnP device.
- */ 
-
+ */
 static void __init
 isapnp_parse_name(char *name, unsigned int name_max, unsigned short *size)
 {
        if (name[0] == '\0') {
-               unsigned short size1 = *size >= name_max ? (name_max - 1) : *size;
+               unsigned short size1 =
+                   *size >= name_max ? (name_max - 1) : *size;
                isapnp_peek(name, size1);
                name[size1] = '\0';
                *size -= size1;
 
                /* clean whitespace from end of string */
-               while (size1 > 0  &&  name[--size1] == ' ')
+               while (size1 > 0 && name[--size1] == ' ')
                        name[size1] = '\0';
        }
 }
@@ -616,7 +597,6 @@ isapnp_parse_name(char *name, unsigned int name_max, unsigned short *size)
 /*
  *  Parse resource map for logical device.
  */
-
 static int __init isapnp_create_device(struct pnp_card *card,
                                       unsigned short size)
 {
@@ -624,6 +604,7 @@ static int __init isapnp_create_device(struct pnp_card *card,
        unsigned char type, tmp[17];
        struct pnp_option *option;
        struct pnp_dev *dev;
+
        if ((dev = isapnp_parse_device(card, size, number++)) == NULL)
                return 1;
        option = pnp_register_independent_option(dev);
@@ -631,17 +612,19 @@ static int __init isapnp_create_device(struct pnp_card *card,
                kfree(dev);
                return 1;
        }
-       pnp_add_card_device(card,dev);
+       pnp_add_card_device(card, dev);
 
        while (1) {
-               if (isapnp_read_tag(&type, &size)<0)
+               if (isapnp_read_tag(&type, &size) < 0)
                        return 1;
                if (skip && type != _STAG_LOGDEVID && type != _STAG_END)
                        goto __skip;
                switch (type) {
                case _STAG_LOGDEVID:
                        if (size >= 5 && size <= 6) {
-                               if ((dev = isapnp_parse_device(card, size, number++)) == NULL)
+                               if ((dev =
+                                    isapnp_parse_device(card, size,
+                                                        number++)) == NULL)
                                        return 1;
                                size = 0;
                                skip = 0;
@@ -650,7 +633,7 @@ static int __init isapnp_create_device(struct pnp_card *card,
                                        kfree(dev);
                                        return 1;
                                }
-                               pnp_add_card_device(card,dev);
+                               pnp_add_card_device(card, dev);
                        } else {
                                skip = 1;
                        }
@@ -660,7 +643,8 @@ static int __init isapnp_create_device(struct pnp_card *card,
                case _STAG_COMPATDEVID:
                        if (size == 4 && compat < DEVICE_COUNT_COMPATIBLE) {
                                isapnp_peek(tmp, 4);
-                               isapnp_parse_id(dev,(tmp[1] << 8) | tmp[0], (tmp[3] << 8) | tmp[2]);
+                               isapnp_parse_id(dev, (tmp[1] << 8) | tmp[0],
+                                               (tmp[3] << 8) | tmp[2]);
                                compat++;
                                size = 0;
                        }
@@ -686,7 +670,7 @@ static int __init isapnp_create_device(struct pnp_card *card,
                                priority = 0x100 | tmp[0];
                                size = 0;
                        }
-                       option = pnp_register_dependent_option(dev,priority);
+                       option = pnp_register_dependent_option(dev, priority);
                        if (!option)
                                return 1;
                        break;
@@ -741,11 +725,13 @@ static int __init isapnp_create_device(struct pnp_card *card,
                                isapnp_skip_bytes(size);
                        return 1;
                default:
-                       printk(KERN_ERR "isapnp: unexpected or unknown tag type 0x%x for logical device %i (device %i), ignored\n", type, dev->number, card->number);
+                       printk(KERN_ERR
+                              "isapnp: unexpected or unknown tag type 0x%x for logical device %i (device %i), ignored\n",
+                              type, dev->number, card->number);
                }
-             __skip:
-               if (size > 0)
-                       isapnp_skip_bytes(size);
+__skip:
+               if (size > 0)
+                       isapnp_skip_bytes(size);
        }
        return 0;
 }
@@ -753,14 +739,13 @@ static int __init isapnp_create_device(struct pnp_card *card,
 /*
  *  Parse resource map for ISA PnP card.
  */
-
 static void __init isapnp_parse_resource_map(struct pnp_card *card)
 {
        unsigned char type, tmp[17];
        unsigned short size;
 
        while (1) {
-               if (isapnp_read_tag(&type, &size)<0)
+               if (isapnp_read_tag(&type, &size) < 0)
                        return;
                switch (type) {
                case _STAG_PNPVERNO:
@@ -773,7 +758,7 @@ static void __init isapnp_parse_resource_map(struct pnp_card *card)
                        break;
                case _STAG_LOGDEVID:
                        if (size >= 5 && size <= 6) {
-                               if (isapnp_create_device(card, size)==1)
+                               if (isapnp_create_device(card, size) == 1)
                                        return;
                                size = 0;
                        }
@@ -781,7 +766,8 @@ static void __init isapnp_parse_resource_map(struct pnp_card *card)
                case _STAG_VENDOR:
                        break;
                case _LTAG_ANSISTR:
-                       isapnp_parse_name(card->name, sizeof(card->name), &size);
+                       isapnp_parse_name(card->name, sizeof(card->name),
+                                         &size);
                        break;
                case _LTAG_UNICODESTR:
                        /* silently ignore */
@@ -794,18 +780,19 @@ static void __init isapnp_parse_resource_map(struct pnp_card *card)
                                isapnp_skip_bytes(size);
                        return;
                default:
-                       printk(KERN_ERR "isapnp: unexpected or unknown tag type 0x%x for device %i, ignored\n", type, card->number);
+                       printk(KERN_ERR
+                              "isapnp: unexpected or unknown tag type 0x%x for device %i, ignored\n",
+                              type, card->number);
                }
-             __skip:
-               if (size > 0)
-                       isapnp_skip_bytes(size);
+__skip:
+               if (size > 0)
+                       isapnp_skip_bytes(size);
        }
 }
 
 /*
  *  Compute ISA PnP checksum for first eight bytes.
  */
-
 static unsigned char __init isapnp_checksum(unsigned char *data)
 {
        int i, j;
@@ -817,7 +804,9 @@ static unsigned char __init isapnp_checksum(unsigned char *data)
                        bit = 0;
                        if (b & (1 << j))
                                bit = 1;
-                       checksum = ((((checksum ^ (checksum >> 1)) & 0x01) ^ bit) << 7) | (checksum >> 1);
+                       checksum =
+                           ((((checksum ^ (checksum >> 1)) & 0x01) ^ bit) << 7)
+                           | (checksum >> 1);
                }
        }
        return checksum;
@@ -826,27 +815,25 @@ static unsigned char __init isapnp_checksum(unsigned char *data)
 /*
  *  Parse EISA id for ISA PnP card.
  */
-
-static void isapnp_parse_card_id(struct pnp_card * card, unsigned short vendor, unsigned short device)
+static void isapnp_parse_card_id(struct pnp_card *card, unsigned short vendor,
+                                unsigned short device)
 {
-       struct pnp_id * id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
+       struct pnp_id *id = kzalloc(sizeof(struct pnp_id), GFP_KERNEL);
+
        if (!id)
                return;
        sprintf(id->id, "%c%c%c%x%x%x%x",
-                       'A' + ((vendor >> 2) & 0x3f) - 1,
-                       'A' + (((vendor & 3) << 3) | ((vendor >> 13) & 7)) - 1,
-                       'A' + ((vendor >> 8) & 0x1f) - 1,
-                       (device >> 4) & 0x0f,
-                       device & 0x0f,
-                       (device >> 12) & 0x0f,
-                       (device >> 8) & 0x0f);
-       pnp_add_card_id(id,card);
+               'A' + ((vendor >> 2) & 0x3f) - 1,
+               'A' + (((vendor & 3) << 3) | ((vendor >> 13) & 7)) - 1,
+               'A' + ((vendor >> 8) & 0x1f) - 1,
+               (device >> 4) & 0x0f,
+               device & 0x0f, (device >> 12) & 0x0f, (device >> 8) & 0x0f);
+       pnp_add_card_id(id, card);
 }
 
 /*
  *  Build device list for all present ISA PnP devices.
  */
-
 static int __init isapnp_build_device_list(void)
 {
        int csn;
@@ -860,22 +847,29 @@ static int __init isapnp_build_device_list(void)
                isapnp_peek(header, 9);
                checksum = isapnp_checksum(header);
 #if 0
-               printk(KERN_DEBUG "vendor: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
-                       header[0], header[1], header[2], header[3],
-                       header[4], header[5], header[6], header[7], header[8]);
+               printk(KERN_DEBUG
+                      "vendor: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
+                      header[0], header[1], header[2], header[3], header[4],
+                      header[5], header[6], header[7], header[8]);
                printk(KERN_DEBUG "checksum = 0x%x\n", checksum);
 #endif
-               if ((card = kzalloc(sizeof(struct pnp_card), GFP_KERNEL)) == NULL)
+               if ((card =
+                    kzalloc(sizeof(struct pnp_card), GFP_KERNEL)) == NULL)
                        continue;
 
                card->number = csn;
                INIT_LIST_HEAD(&card->devices);
-               isapnp_parse_card_id(card, (header[1] << 8) | header[0], (header[3] << 8) | header[2]);
-               card->serial = (header[7] << 24) | (header[6] << 16) | (header[5] << 8) | header[4];
+               isapnp_parse_card_id(card, (header[1] << 8) | header[0],
+                                    (header[3] << 8) | header[2]);
+               card->serial =
+                   (header[7] << 24) | (header[6] << 16) | (header[5] << 8) |
+                   header[4];
                isapnp_checksum_value = 0x00;
                isapnp_parse_resource_map(card);
                if (isapnp_checksum_value != 0x00)
-                       printk(KERN_ERR "isapnp: checksum for device %i is not valid (0x%x)\n", csn, isapnp_checksum_value);
+                       printk(KERN_ERR
+                              "isapnp: checksum for device %i is not valid (0x%x)\n",
+                              csn, isapnp_checksum_value);
                card->checksum = isapnp_checksum_value;
                card->protocol = &isapnp_protocol;
 
@@ -892,6 +886,7 @@ static int __init isapnp_build_device_list(void)
 int isapnp_present(void)
 {
        struct pnp_card *card;
+
        pnp_for_each_card(card) {
                if (card->protocol == &isapnp_protocol)
                        return 1;
@@ -913,13 +908,13 @@ int isapnp_cfg_begin(int csn, int logdev)
        /* it is possible to set RDP only in the isolation phase */
        /*   Jens Thoms Toerring <Jens.Toerring@physik.fu-berlin.de> */
        isapnp_write_byte(0x02, 0x04);  /* clear CSN of card */
-       mdelay(2);                      /* is this necessary? */
-       isapnp_wake(csn);               /* bring card into sleep state */
-       isapnp_wake(0);                 /* bring card into isolation state */
-       isapnp_set_rdp();               /* reset the RDP port */
-       udelay(1000);                   /* delay 1000us */
+       mdelay(2);              /* is this necessary? */
+       isapnp_wake(csn);       /* bring card into sleep state */
+       isapnp_wake(0);         /* bring card into isolation state */
+       isapnp_set_rdp();       /* reset the RDP port */
+       udelay(1000);           /* delay 1000us */
        isapnp_write_byte(0x06, csn);   /* reset CSN to previous value */
-       udelay(250);                    /* is this necessary? */
+       udelay(250);            /* is this necessary? */
 #endif
        if (logdev >= 0)
                isapnp_device(logdev);
@@ -933,22 +928,18 @@ int isapnp_cfg_end(void)
        return 0;
 }
 
-
 /*
- *  Inititialization.
+ *  Initialization.
  */
 
-
 EXPORT_SYMBOL(isapnp_protocol);
 EXPORT_SYMBOL(isapnp_present);
 EXPORT_SYMBOL(isapnp_cfg_begin);
 EXPORT_SYMBOL(isapnp_cfg_end);
-#if 0
-EXPORT_SYMBOL(isapnp_read_byte);
-#endif
 EXPORT_SYMBOL(isapnp_write_byte);
 
-static int isapnp_read_resources(struct pnp_dev *dev, struct pnp_resource_table *res)
+static int isapnp_read_resources(struct pnp_dev *dev,
+                                struct pnp_resource_table *res)
 {
        int tmp, ret;
 
@@ -962,33 +953,40 @@ static int isapnp_read_resources(struct pnp_dev *dev, struct pnp_resource_table
                        res->port_resource[tmp].flags = IORESOURCE_IO;
                }
                for (tmp = 0; tmp < PNP_MAX_MEM; tmp++) {
-                       ret = isapnp_read_word(ISAPNP_CFG_MEM + (tmp << 3)) << 8;
+                       ret =
+                           isapnp_read_word(ISAPNP_CFG_MEM + (tmp << 3)) << 8;
                        if (!ret)
                                continue;
                        res->mem_resource[tmp].start = ret;
                        res->mem_resource[tmp].flags = IORESOURCE_MEM;
                }
                for (tmp = 0; tmp < PNP_MAX_IRQ; tmp++) {
-                       ret = (isapnp_read_word(ISAPNP_CFG_IRQ + (tmp << 1)) >> 8);
+                       ret =
+                           (isapnp_read_word(ISAPNP_CFG_IRQ + (tmp << 1)) >>
+                            8);
                        if (!ret)
                                continue;
-                       res->irq_resource[tmp].start = res->irq_resource[tmp].end = ret;
+                       res->irq_resource[tmp].start =
+                           res->irq_resource[tmp].end = ret;
                        res->irq_resource[tmp].flags = IORESOURCE_IRQ;
                }
                for (tmp = 0; tmp < PNP_MAX_DMA; tmp++) {
                        ret = isapnp_read_byte(ISAPNP_CFG_DMA + tmp);
                        if (ret == 4)
                                continue;
-                       res->dma_resource[tmp].start = res->dma_resource[tmp].end = ret;
+                       res->dma_resource[tmp].start =
+                           res->dma_resource[tmp].end = ret;
                        res->dma_resource[tmp].flags = IORESOURCE_DMA;
                }
        }
        return 0;
 }
 
-static int isapnp_get_resources(struct pnp_dev *dev, struct pnp_resource_table * res)
+static int isapnp_get_resources(struct pnp_dev *dev,
+                               struct pnp_resource_table *res)
 {
        int ret;
+
        pnp_init_resource_table(res);
        isapnp_cfg_begin(dev->card->number, dev->number);
        ret = isapnp_read_resources(dev, res);
@@ -996,24 +994,44 @@ static int isapnp_get_resources(struct pnp_dev *dev, struct pnp_resource_table *
        return ret;
 }
 
-static int isapnp_set_resources(struct pnp_dev *dev, struct pnp_resource_table * res)
+static int isapnp_set_resources(struct pnp_dev *dev,
+                               struct pnp_resource_table *res)
 {
        int tmp;
 
        isapnp_cfg_begin(dev->card->number, dev->number);
        dev->active = 1;
-       for (tmp = 0; tmp < PNP_MAX_PORT && (res->port_resource[tmp].flags & (IORESOURCE_IO | IORESOURCE_UNSET)) == IORESOURCE_IO; tmp++)
-               isapnp_write_word(ISAPNP_CFG_PORT+(tmp<<1), res->port_resource[tmp].start);
-       for (tmp = 0; tmp < PNP_MAX_IRQ && (res->irq_resource[tmp].flags & (IORESOURCE_IRQ | IORESOURCE_UNSET)) == IORESOURCE_IRQ; tmp++) {
+       for (tmp = 0;
+            tmp < PNP_MAX_PORT
+            && (res->port_resource[tmp].
+                flags & (IORESOURCE_IO | IORESOURCE_UNSET)) == IORESOURCE_IO;
+            tmp++)
+               isapnp_write_word(ISAPNP_CFG_PORT + (tmp << 1),
+                                 res->port_resource[tmp].start);
+       for (tmp = 0;
+            tmp < PNP_MAX_IRQ
+            && (res->irq_resource[tmp].
+                flags & (IORESOURCE_IRQ | IORESOURCE_UNSET)) == IORESOURCE_IRQ;
+            tmp++) {
                int irq = res->irq_resource[tmp].start;
                if (irq == 2)
                        irq = 9;
-               isapnp_write_byte(ISAPNP_CFG_IRQ+(tmp<<1), irq);
+               isapnp_write_byte(ISAPNP_CFG_IRQ + (tmp << 1), irq);
        }
-       for (tmp = 0; tmp < PNP_MAX_DMA && (res->dma_resource[tmp].flags & (IORESOURCE_DMA | IORESOURCE_UNSET)) == IORESOURCE_DMA; tmp++)
-               isapnp_write_byte(ISAPNP_CFG_DMA+tmp, res->dma_resource[tmp].start);
-       for (tmp = 0; tmp < PNP_MAX_MEM && (res->mem_resource[tmp].flags & (IORESOURCE_MEM | IORESOURCE_UNSET)) == IORESOURCE_MEM; tmp++)
-               isapnp_write_word(ISAPNP_CFG_MEM+(tmp<<3), (res->mem_resource[tmp].start >> 8) & 0xffff);
+       for (tmp = 0;
+            tmp < PNP_MAX_DMA
+            && (res->dma_resource[tmp].
+                flags & (IORESOURCE_DMA | IORESOURCE_UNSET)) == IORESOURCE_DMA;
+            tmp++)
+               isapnp_write_byte(ISAPNP_CFG_DMA + tmp,
+                                 res->dma_resource[tmp].start);
+       for (tmp = 0;
+            tmp < PNP_MAX_MEM
+            && (res->mem_resource[tmp].
+                flags & (IORESOURCE_MEM | IORESOURCE_UNSET)) == IORESOURCE_MEM;
+            tmp++)
+               isapnp_write_word(ISAPNP_CFG_MEM + (tmp << 3),
+                                 (res->mem_resource[tmp].start >> 8) & 0xffff);
        /* FIXME: We aren't handling 32bit mems properly here */
        isapnp_activate(dev->number);
        isapnp_cfg_end();
@@ -1022,7 +1040,7 @@ static int isapnp_set_resources(struct pnp_dev *dev, struct pnp_resource_table *
 
 static int isapnp_disable_resources(struct pnp_dev *dev)
 {
-       if (!dev || !dev->active)
+       if (!dev->active)
                return -EINVAL;
        isapnp_cfg_begin(dev->card->number, dev->number);
        isapnp_deactivate(dev->number);
@@ -1032,9 +1050,9 @@ static int isapnp_disable_resources(struct pnp_dev *dev)
 }
 
 struct pnp_protocol isapnp_protocol = {
-       .name   = "ISA Plug and Play",
-       .get    = isapnp_get_resources,
-       .set    = isapnp_set_resources,
+       .name = "ISA Plug and Play",
+       .get = isapnp_get_resources,
+       .set = isapnp_set_resources,
        .disable = isapnp_disable_resources,
 };
 
@@ -1045,7 +1063,6 @@ static int __init isapnp_init(void)
        struct pnp_dev *dev;
 
        if (isapnp_disable) {
-               isapnp_detected = 0;
                printk(KERN_INFO "isapnp: ISA Plug & Play support disabled\n");
                return 0;
        }
@@ -1055,31 +1072,36 @@ static int __init isapnp_init(void)
 #endif
 #ifdef ISAPNP_REGION_OK
        if (!request_region(_PIDXR, 1, "isapnp index")) {
-               printk(KERN_ERR "isapnp: Index Register 0x%x already used\n", _PIDXR);
+               printk(KERN_ERR "isapnp: Index Register 0x%x already used\n",
+                      _PIDXR);
                return -EBUSY;
        }
 #endif
        if (!request_region(_PNPWRP, 1, "isapnp write")) {
-               printk(KERN_ERR "isapnp: Write Data Register 0x%x already used\n", _PNPWRP);
+               printk(KERN_ERR
+                      "isapnp: Write Data Register 0x%x already used\n",
+                      _PNPWRP);
 #ifdef ISAPNP_REGION_OK
                release_region(_PIDXR, 1);
 #endif
                return -EBUSY;
        }
 
-       if(pnp_register_protocol(&isapnp_protocol)<0)
+       if (pnp_register_protocol(&isapnp_protocol) < 0)
                return -EBUSY;
 
        /*
-        *      Print a message. The existing ISAPnP code is hanging machines
-        *      so let the user know where.
+        *      Print a message. The existing ISAPnP code is hanging machines
+        *      so let the user know where.
         */
-        
+
        printk(KERN_INFO "isapnp: Scanning for PnP cards...\n");
        if (isapnp_rdp >= 0x203 && isapnp_rdp <= 0x3ff) {
                isapnp_rdp |= 3;
                if (!request_region(isapnp_rdp, 1, "isapnp read")) {
-                       printk(KERN_ERR "isapnp: Read Data Register 0x%x already used\n", isapnp_rdp);
+                       printk(KERN_ERR
+                              "isapnp: Read Data Register 0x%x already used\n",
+                              isapnp_rdp);
 #ifdef ISAPNP_REGION_OK
                        release_region(_PIDXR, 1);
 #endif
@@ -1088,17 +1110,15 @@ static int __init isapnp_init(void)
                }
                isapnp_set_rdp();
        }
-       isapnp_detected = 1;
        if (isapnp_rdp < 0x203 || isapnp_rdp > 0x3ff) {
                cards = isapnp_isolate();
-               if (cards < 0 || 
-                   (isapnp_rdp < 0x203 || isapnp_rdp > 0x3ff)) {
+               if (cards < 0 || (isapnp_rdp < 0x203 || isapnp_rdp > 0x3ff)) {
 #ifdef ISAPNP_REGION_OK
                        release_region(_PIDXR, 1);
 #endif
                        release_region(_PNPWRP, 1);
-                       isapnp_detected = 0;
-                       printk(KERN_INFO "isapnp: No Plug & Play device found\n");
+                       printk(KERN_INFO
+                              "isapnp: No Plug & Play device found\n");
                        return 0;
                }
                request_region(isapnp_rdp, 1, "isapnp read");
@@ -1106,22 +1126,25 @@ static int __init isapnp_init(void)
        isapnp_build_device_list();
        cards = 0;
 
-       protocol_for_each_card(&isapnp_protocol,card) {
+       protocol_for_each_card(&isapnp_protocol, card) {
                cards++;
                if (isapnp_verbose) {
-                       printk(KERN_INFO "isapnp: Card '%s'\n", card->name[0]?card->name:"Unknown");
+                       printk(KERN_INFO "isapnp: Card '%s'\n",
+                              card->name[0] ? card->name : "Unknown");
                        if (isapnp_verbose < 2)
                                continue;
-                       card_for_each_dev(card,dev) {
-                               printk(KERN_INFO "isapnp:   Device '%s'\n", dev->name[0]?dev->name:"Unknown");
+                       card_for_each_dev(card, dev) {
+                               printk(KERN_INFO "isapnp:   Device '%s'\n",
+                                      dev->name[0] ? dev->name : "Unknown");
                        }
                }
        }
-       if (cards) {
-               printk(KERN_INFO "isapnp: %i Plug & Play card%s detected total\n", cards, cards>1?"s":"");
-       } else {
+       if (cards)
+               printk(KERN_INFO
+                      "isapnp: %i Plug & Play card%s detected total\n", cards,
+                      cards > 1 ? "s" : "");
+       else
                printk(KERN_INFO "isapnp: No Plug & Play card found\n");
-       }
 
        isapnp_proc_init();
        return 0;
@@ -1143,11 +1166,10 @@ __setup("noisapnp", isapnp_setup_disable);
 
 static int __init isapnp_setup_isapnp(char *str)
 {
-       (void)((get_option(&str,&isapnp_rdp) == 2) &&
-              (get_option(&str,&isapnp_reset) == 2) &&
-              (get_option(&str,&isapnp_verbose) == 2));
+       (void)((get_option(&str, &isapnp_rdp) == 2) &&
+              (get_option(&str, &isapnp_reset) == 2) &&
+              (get_option(&str, &isapnp_verbose) == 2));
        return 1;
 }
 
 __setup("isapnp=", isapnp_setup_isapnp);
-