Update of /cvsroot/alsa/alsa-kernel/pcmcia/vx
In directory sc8-pr-cvs1:/tmp/cvs-serv19766/pcmcia/vx
Modified Files:
Makefile vx_entry.c vxpocket.c
Log Message:
Sync with 2.5 tree - mostly small updates and build fixes
Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pcmcia/vx/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile 23 May 2003 16:00:45 -0000 1.1
+++ Makefile 10 Jun 2003 14:07:23 -0000 1.2
@@ -3,8 +3,9 @@
# Copyright (c) 2001 by Jaroslav Kysela <[EMAIL PROTECTED]>
#
-snd-vxpocket-objs := vxpocket.o vx_entry.o vxp_ops.o vxp_mixer.o
-snd-vxp440-objs := vxpocket.o vx_entry.o vxp_ops.o vxp_mixer.o
+snd-vx-cs-objs := vx_entry.o vxp_ops.o vxp_mixer.o
+snd-vxpocket-objs := vxpocket.o
+snd-vxp440-objs := vxp440.o
-obj-$(CONFIG_SND_VXPOCKET) += snd-vxpocket.o
-obj-$(CONFIG_SND_VXP440) += snd-vxp440.o
+obj-$(CONFIG_SND_VXPOCKET) += snd-vxpocket.o snd-vx-cs.o
+obj-$(CONFIG_SND_VXP440) += snd-vxp440.o snd-vx-cs.o
Index: vx_entry.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pcmcia/vx/vx_entry.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vx_entry.c 23 May 2003 16:00:45 -0000 1.1
+++ vx_entry.c 10 Jun 2003 14:07:24 -0000 1.2
@@ -371,10 +371,6 @@
return 0;
}
-/* we link this module statically with the card modules
- * due to the pcmcia symbol problems...
- */
-#if 0
/*
* exported stuffs
*/
@@ -382,4 +378,3 @@
EXPORT_SYMBOL(snd_vxpocket_attach);
EXPORT_SYMBOL(snd_vxpocket_detach);
EXPORT_SYMBOL(snd_vxpocket_detach_all);
-#endif
Index: vxpocket.c
===================================================================
RCS file: /cvsroot/alsa/alsa-kernel/pcmcia/vx/vxpocket.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vxpocket.c 23 May 2003 16:00:45 -0000 1.1
+++ vxpocket.c 10 Jun 2003 14:07:24 -0000 1.2
@@ -34,7 +34,6 @@
#include <sound/core.h>
#include <pcmcia/version.h>
#include "vxpocket.h"
-#define SNDRV_GET_ID
#include <sound/initval.h>
/*
@@ -81,7 +80,6 @@
*/
#ifdef COMPILE_VXP440
-static dev_info_t dev_info = "snd-vxp440";
/* 1 DSP, 1 sync UER, 1 sync World Clock (NIY) */
/* SMPTE (NIY) */
@@ -92,9 +90,9 @@
#define NUM_CODECS 2
#define CARD_TYPE VX_TYPE_VXP440
+#define DEV_INFO "snd-vxp440"
#else
-static dev_info_t dev_info = "snd-vxpocket";
/* 1 DSP, 1 sync UER */
/* 1 programmable clock (NIY) */
@@ -104,8 +102,11 @@
#define NUM_CODECS 1
#define CARD_TYPE VX_TYPE_VXPOCKET
+#define DEV_INFO "snd-vxpocket"
+
#endif
+static dev_info_t dev_info = DEV_INFO;
static struct snd_vx_hardware vxp_hw = {
.name = CARD_NAME,
@@ -146,28 +147,28 @@
snd_vxpocket_detach(&hw_entry, link);
}
-
/*
* Module entry points
*/
+static struct pcmcia_driver vxp_cs_driver = {
+ .owner = THIS_MODULE,
+ .drv = {
+ .name = DEV_INFO,
+ },
+ .attach = vxp_attach,
+ .detach = vxp_detach
+};
+
static int __init init_vxpocket(void)
{
- servinfo_t serv;
-
- CardServices(GetCardServicesInfo, &serv);
- if (serv.Revision != CS_RELEASE_CODE) {
- printk(KERN_WARNING "init_vxpocket: Card Services release does not
match (%x != %x)!\n", serv.Revision, CS_RELEASE_CODE);
- return -1;
- }
- register_pccard_driver(&dev_info, vxp_attach, vxp_detach);
- return 0;
+ return pcmcia_register_driver(&vxp_cs_driver);
}
static void __exit exit_vxpocket(void)
{
- unregister_pccard_driver(&dev_info);
- snd_vxpocket_detach_all(&hw_entry);
+ pcmcia_unregister_driver(&vxp_cs_driver);
+ snd_vxpocket_detach_all(&hw_entry);
}
module_init(init_vxpocket);
-------------------------------------------------------
This SF.net email is sponsored by: Etnus, makers of TotalView, The best
thread debugger on the planet. Designed with thread debugging features
you've never dreamed of, try TotalView 6 free at www.etnus.com.
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
