patch-2.3.34 linux/drivers/pcmcia/cs.c

• Lines: 123
• Date: Mon Dec 20 17:52:46 1999
• Orig file: v2.3.33/linux/drivers/pcmcia/cs.c
• Orig date: Tue Dec 14 01:27:24 1999

diff -u --recursive --new-file v2.3.33/linux/drivers/pcmcia/cs.c linux/drivers/pcmcia/cs.c
@@ -1814,7 +1814,7 @@
 
 ======================================================================*/
 
-int pcmcia_request_window(client_handle_t *handle, win_req_t *req)
+int pcmcia_request_window(client_handle_t *handle, win_req_t *req, window_handle_t *wh)
 {
     socket_info_t *s;
     window_t *win;
@@ -1876,7 +1876,7 @@
     s->state |= SOCKET_WIN_REQ(w);
 
     /* Return window handle */
-    *handle = (client_handle_t)win;
+    *wh = win;
     
     return CS_SUCCESS;
 } /* request_window */
@@ -2141,7 +2141,14 @@
     case ModifyWindow:
 	return pcmcia_modify_window(a1, a2); break;
     case OpenMemory:
-	return pcmcia_open_memory(a1, a2);
+/*	return pcmcia_open_memory(a1, a2); */
+    {
+	memory_handle_t m;
+        int ret = pcmcia_open_memory(a1, a2, &m);
+        (memory_handle_t *)a1 = m;
+	return  ret;
+    }
+        break;
     case ParseTuple:
 	return pcmcia_parse_tuple(a1, a2, a3); break;
     case ReadMemory:
@@ -2149,8 +2156,15 @@
     case RegisterClient:
 	return pcmcia_register_client(a1, a2); break;
     case RegisterEraseQueue:
-	return pcmcia_register_erase_queue(a1, a2); break;
-    case RegisterMTD:
+    {
+	eraseq_handle_t w;
+        int ret = pcmcia_register_erase_queue(a1, a2, &w);
+        (eraseq_handle_t *)a1 = w;
+	return  ret;
+    }
+        break;
+/*	return pcmcia_register_erase_queue(a1, a2); break; */
+
 	return pcmcia_register_mtd(a1, a2); break;
     case ReleaseConfiguration:
 	return pcmcia_release_configuration(a1); break;
@@ -2167,7 +2181,13 @@
     case RequestIRQ:
 	return pcmcia_request_irq(a1, a2); break;
     case RequestWindow:
-	return pcmcia_request_window(a1, a2); break;
+    {
+	window_handle_t w;
+        int ret = pcmcia_request_window(a1, a2, &w);
+        (window_handle_t *)a1 = w;
+	return  ret;
+    }
+        break;
     case ResetCard:
 	return pcmcia_reset_card(a1, a2); break;
     case SetEventMask:
@@ -2209,6 +2229,55 @@
     OS-specific module glue goes here
     
 ======================================================================*/
+EXPORT_SYMBOL(pcmcia_access_configuration_register);
+EXPORT_SYMBOL(pcmcia_adjust_resource_info);
+EXPORT_SYMBOL(pcmcia_check_erase_queue);
+EXPORT_SYMBOL(pcmcia_close_memory);
+EXPORT_SYMBOL(pcmcia_copy_memory);
+EXPORT_SYMBOL(pcmcia_deregister_client);
+EXPORT_SYMBOL(pcmcia_deregister_erase_queue);
+EXPORT_SYMBOL(pcmcia_get_first_client);
+EXPORT_SYMBOL(pcmcia_get_card_services_info);
+EXPORT_SYMBOL(pcmcia_get_configuration_info);
+EXPORT_SYMBOL(pcmcia_get_next_client);
+EXPORT_SYMBOL(pcmcia_get_first_region);
+EXPORT_SYMBOL(pcmcia_get_first_tuple);
+EXPORT_SYMBOL(pcmcia_get_next_region);
+EXPORT_SYMBOL(pcmcia_get_next_tuple);
+EXPORT_SYMBOL(pcmcia_get_status);
+EXPORT_SYMBOL(pcmcia_get_tuple_data);
+EXPORT_SYMBOL(pcmcia_map_mem_page);
+EXPORT_SYMBOL(pcmcia_modify_configuration);
+EXPORT_SYMBOL(pcmcia_modify_window);
+EXPORT_SYMBOL(pcmcia_open_memory);
+EXPORT_SYMBOL(pcmcia_parse_tuple);
+EXPORT_SYMBOL(pcmcia_read_memory);
+EXPORT_SYMBOL(pcmcia_register_client);
+EXPORT_SYMBOL(pcmcia_register_erase_queue);
+EXPORT_SYMBOL(pcmcia_register_mtd);
+EXPORT_SYMBOL(pcmcia_release_configuration);
+EXPORT_SYMBOL(pcmcia_release_io);
+EXPORT_SYMBOL(pcmcia_release_irq);
+EXPORT_SYMBOL(pcmcia_release_window);
+EXPORT_SYMBOL(pcmcia_request_configuration);
+EXPORT_SYMBOL(pcmcia_request_io);
+EXPORT_SYMBOL(pcmcia_request_irq);
+EXPORT_SYMBOL(pcmcia_request_window);
+EXPORT_SYMBOL(pcmcia_reset_card);
+EXPORT_SYMBOL(pcmcia_set_event_mask);
+EXPORT_SYMBOL(pcmcia_validate_cis);
+EXPORT_SYMBOL(pcmcia_write_memory);
+EXPORT_SYMBOL(pcmcia_bind_device);
+EXPORT_SYMBOL(pcmcia_bind_mtd);
+EXPORT_SYMBOL(pcmcia_report_error);
+EXPORT_SYMBOL(pcmcia_suspend_card);
+EXPORT_SYMBOL(pcmcia_resume_card);
+EXPORT_SYMBOL(pcmcia_eject_card);
+EXPORT_SYMBOL(pcmcia_insert_card);
+EXPORT_SYMBOL(pcmcia_replace_cis);
+EXPORT_SYMBOL(pcmcia_get_first_window);
+EXPORT_SYMBOL(pcmcia_get_next_window);
+EXPORT_SYMBOL(pcmcia_get_mem_page);
 
 EXPORT_SYMBOL(register_ss_entry);
 EXPORT_SYMBOL(unregister_ss_entry);