[PCMCIA] 15-get_firstnext_region.diff

pcmcia_get_{first,next}_region are tricky: they're used
only by ds.c, but to keep backwards compatibility proper
wrappers are needed (for the moment). However, match_region()
doesn't work without knowing about ds.c's handle, it seems...
but wait:

    while (list != NULL) {
        if (!(handle->Attributes & INFO_MTD_CLIENT) ||
            (strcmp(handle->dev_info, list->dev_info) == 0)) {
            *match = list->info;
            return CS_SUCCESS;
        }
        list = list->info.next;
    }

as ds.c's handle doesn't have INFO_MTD_CLIENT, the if always
succeeds -- allowing is to simplify it for ds.c. However, this
means we need special functions for ds.c. It's not too large,
fortunately.

diff --git a/drivers/pcmcia/bulkmem.c b/drivers/pcmcia/bulkmem.c
index 43b9ae71483901d8b0837eaef5e9f9ba45c7f11e..c3fe894b54acf9302ba5074b14eb9403bae15824 100644 (file)
--- a/drivers/pcmcia/bulkmem.c
+++ b/drivers/pcmcia/bulkmem.c
@@ -69,8 +69,8 @@ extern int pc_debug;
     
 ======================================================================*/
 
-static void setup_regions(client_handle_t handle, int attr,
-                         memory_handle_t *list)
+static void setup_regions(struct pcmcia_socket *s, unsigned int function,
+                         int attr,  memory_handle_t *list)
 {
     int i, code, has_jedec, has_geo;
     u_int offset;
@@ -79,22 +79,22 @@ static void setup_regions(client_handle_t handle, int attr,
     cistpl_device_geo_t geo;
     memory_handle_t r;
 
-    ds_dbg(SOCKET(handle), 1, "setup_regions(0x%p, %d, 0x%p)\n",
-          handle, attr, list);
+    ds_dbg(s, 1, "setup_regions(0x%d, %d, 0x%p)\n",
+          function, attr, list);
 
     code = (attr) ? CISTPL_DEVICE_A : CISTPL_DEVICE;
-    if (pccard_read_tuple(handle->Socket, handle->Function, code, &device) != CS_SUCCESS)
+    if (pccard_read_tuple(s, function, code, &device) != CS_SUCCESS)
        return;
     code = (attr) ? CISTPL_JEDEC_A : CISTPL_JEDEC_C;
-    has_jedec = (pccard_read_tuple(handle->Socket, handle->Function, code, &jedec) == CS_SUCCESS);
+    has_jedec = (pccard_read_tuple(s, function, code, &jedec) == CS_SUCCESS);
     if (has_jedec && (device.ndev != jedec.nid)) {
-       ds_dbg(SOCKET(handle), 0, "Device info does not match JEDEC info.\n");
+       ds_dbg(s, 0, "Device info does not match JEDEC info.\n");
        has_jedec = 0;
     }
     code = (attr) ? CISTPL_DEVICE_GEO_A : CISTPL_DEVICE_GEO;
-    has_geo = (pccard_read_tuple(handle->Socket, handle->Function, code, &geo) == CS_SUCCESS);
+    has_geo = (pccard_read_tuple(s, function, code, &geo) == CS_SUCCESS);
     if (has_geo && (device.ndev != geo.ngeo)) {
-       ds_dbg(SOCKET(handle), 0, "Device info does not match geometry tuple.\n");
+       ds_dbg(s, 0, "Device info does not match geometry tuple.\n");
        has_geo = 0;
     }
     
@@ -142,6 +142,37 @@ static void setup_regions(client_handle_t handle, int attr,
     
 ======================================================================*/
 
+static int pccard_match_region(memory_handle_t list, region_info_t *match)
+{
+       if (list) {
+               *match = list->info;
+               return CS_SUCCESS;
+       }
+       return CS_NO_MORE_ITEMS;
+} /* match_region */
+
+int pccard_get_first_region(struct pcmcia_socket *s, region_info_t *rgn)
+{
+       if (!(s->state & SOCKET_REGION_INFO)) {
+               setup_regions(s, BIND_FN_ALL, 0, &s->c_region);
+               setup_regions(s, BIND_FN_ALL, 1, &s->a_region);
+               s->state |= SOCKET_REGION_INFO;
+       }
+
+       if (rgn->Attributes & REGION_TYPE_AM)
+               return pccard_match_region(s->a_region, rgn);
+       else
+               return pccard_match_region(s->c_region, rgn);
+} /* get_first_region */
+
+int pccard_get_next_region(struct pcmcia_socket *s, region_info_t *rgn)
+{
+    return pccard_match_region(rgn->next, rgn);
+} /* get_next_region */
+
+
+#ifdef CONFIG_PCMCIA_OBSOLETE
+
 static int match_region(client_handle_t handle, memory_handle_t list,
                        region_info_t *match)
 {
@@ -164,8 +195,8 @@ int pcmcia_get_first_region(client_handle_t handle, region_info_t *rgn)
     
     if ((handle->Attributes & INFO_MASTER_CLIENT) &&
        (!(s->state & SOCKET_REGION_INFO))) {
-       setup_regions(handle, 0, &s->c_region);
-       setup_regions(handle, 1, &s->a_region);
+       setup_regions(s, handle->Function, 0, &s->c_region);
+       setup_regions(s, handle->Function, 1, &s->a_region);
        s->state |= SOCKET_REGION_INFO;
     }
 
@@ -183,3 +214,5 @@ int pcmcia_get_next_region(client_handle_t handle, region_info_t *rgn)
     return match_region(handle, rgn->next, rgn);
 } /* get_next_region */
 EXPORT_SYMBOL(pcmcia_get_next_region);
+
+#endif

diff --git a/drivers/pcmcia/cs_internal.h b/drivers/pcmcia/cs_internal.h
index a485cdaa53de834031b0c51716b3edf20c7cb3cf..fbce6b67988b22ed80f55146c767d4e8ad0337c4 100644 (file)
--- a/drivers/pcmcia/cs_internal.h
+++ b/drivers/pcmcia/cs_internal.h
@@ -148,10 +148,6 @@ void destroy_cis_cache(struct pcmcia_socket *s);
 int verify_cis_cache(struct pcmcia_socket *s);
 int pccard_read_tuple(struct pcmcia_socket *s, unsigned int function, cisdata_t code, void *parse);
 
-/* In bulkmem.c */
-int pcmcia_get_first_region(client_handle_t handle, region_info_t *rgn);
-int pcmcia_get_next_region(client_handle_t handle, region_info_t *rgn);
-
 /* In rsrc_mgr */
 void pcmcia_validate_mem(struct pcmcia_socket *s);
 struct resource *find_io_region(unsigned long base, int num, unsigned long align,

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index d75e29057e49eb2e6e2e49c8eb51222eaf45c2eb..41163a17ec035219ba1c973f57080e5bc050451c 100644 (file)
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -885,6 +885,8 @@ static u_int ds_poll(struct file *file, poll_table *wait)
 /*====================================================================*/
 
 extern int pcmcia_adjust_resource_info(adjust_t *adj);
+extern int pccard_get_next_region(struct pcmcia_socket *s, region_info_t *rgn);
+extern int pccard_get_first_region(struct pcmcia_socket *s, region_info_t *rgn);
 
 static int ds_ioctl(struct inode * inode, struct file * file,
                    u_int cmd, u_long arg)
@@ -998,10 +1000,10 @@ static int ds_ioctl(struct inode * inode, struct file * file,
            ret = pccard_access_configuration_register(s->parent, buf.conf_reg.Function, &buf.conf_reg);
        break;
     case DS_GET_FIRST_REGION:
-        ret = pcmcia_get_first_region(s->handle, &buf.region);
+        ret = pccard_get_first_region(s->parent, &buf.region);
        break;
     case DS_GET_NEXT_REGION:
-       ret = pcmcia_get_next_region(s->handle, &buf.region);
+       ret = pccard_get_next_region(s->parent, &buf.region);
        break;
     case DS_GET_FIRST_WINDOW:
        ret = pcmcia_get_window(s->parent, &buf.win_info.handle, 0, &buf.win_info.window);