Update of /cvsroot/alsa/alsa-driver/include
In directory sc8-pr-cvs1:/tmp/cvs-serv18937/include
Modified Files:
compat_cs.h
Log Message:
- use inline functions for the cs-compatible wrapper.
snd.o has no longer dependency to pcmcia module.
Index: compat_cs.h
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/include/compat_cs.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat_cs.h 10 Jun 2003 14:04:27 -0000 1.1
+++ compat_cs.h 23 Jun 2003 12:54:51 -0000 1.2
@@ -4,6 +4,7 @@
#include <pcmcia/cs.h>
#include <pcmcia/cistpl.h>
#include <pcmcia/ds.h>
+#include <pcmcia/version.h>
struct cs_device_driver {
const char *name;
@@ -18,9 +19,25 @@
};
/* driver registration */
-int snd_compat_pcmcia_register_driver(struct pcmcia_driver *driver);
+static inline int snd_compat_pcmcia_register_driver(struct pcmcia_driver *driver)
+{
+ servinfo_t serv;
+
+ CardServices(GetCardServicesInfo, &serv);
+ if (serv.Revision != CS_RELEASE_CODE) {
+ printk(KERN_WARNING "%s: Card Services release does not match (%x !=
%x)!\n", driver->drv.name, serv.Revision, CS_RELEASE_CODE);
+ return -EIO;
+ }
+ register_pccard_driver((dev_info_t *)&driver->drv.name, driver->attach,
driver->detach);
+ return 0;
+}
+
+static inline void snd_compat_pcmcia_unregister_driver(struct pcmcia_driver *driver)
+{
+ unregister_pccard_driver((dev_info_t *)&driver->drv.name);
+}
+
#define pcmcia_register_driver(driver) snd_compat_pcmcia_register_driver(driver)
-void snd_compat_pcmcia_unregister_driver(struct pcmcia_driver *driver);
#define pcmcia_unregister_driver(driver) snd_compat_pcmcia_unregister_driver(driver)
#endif /* 2.5.0+ */
-------------------------------------------------------
This SF.Net email is sponsored by: INetU
Attention Web Developers & Consultants: Become An INetU Hosting Partner.
Refer Dedicated Servers. We Manage Them. You Get 10% Monthly Commission!
INetU Dedicated Managed Hosting http://www.inetu.net/partner/index.php
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
