Commit fe05f541 authored by Linus Torvalds's avatar Linus Torvalds
parents e5cef95d 67bc6200
...@@ -13,11 +13,12 @@ ...@@ -13,11 +13,12 @@
* *
* (C) 2000,2001,2002,2003,2004 Omnikey AG * (C) 2000,2001,2002,2003,2004 Omnikey AG
* *
* (C) 2005 Harald Welte <laforge@gnumonks.org> * (C) 2005-2006 Harald Welte <laforge@gnumonks.org>
* - Adhere to Kernel CodingStyle * - Adhere to Kernel CodingStyle
* - Port to 2.6.13 "new" style PCMCIA * - Port to 2.6.13 "new" style PCMCIA
* - Check for copy_{from,to}_user return values * - Check for copy_{from,to}_user return values
* - Use nonseekable_open() * - Use nonseekable_open()
* - add class interface for udev device creation
* *
* All rights reserved. Licensed under dual BSD/GPL license. * All rights reserved. Licensed under dual BSD/GPL license.
*/ */
...@@ -56,7 +57,7 @@ module_param(pc_debug, int, 0600); ...@@ -56,7 +57,7 @@ module_param(pc_debug, int, 0600);
#else #else
#define DEBUGP(n, rdr, x, args...) #define DEBUGP(n, rdr, x, args...)
#endif #endif
static char *version = "cm4000_cs.c v2.4.0gm5 - All bugs added by Harald Welte"; static char *version = "cm4000_cs.c v2.4.0gm6 - All bugs added by Harald Welte";
#define T_1SEC (HZ) #define T_1SEC (HZ)
#define T_10MSEC msecs_to_jiffies(10) #define T_10MSEC msecs_to_jiffies(10)
...@@ -156,6 +157,7 @@ struct cm4000_dev { ...@@ -156,6 +157,7 @@ struct cm4000_dev {
/*queue*/ 4*sizeof(wait_queue_head_t)) /*queue*/ 4*sizeof(wait_queue_head_t))
static dev_link_t *dev_table[CM4000_MAX_DEV]; static dev_link_t *dev_table[CM4000_MAX_DEV];
static struct class *cmm_class;
/* This table doesn't use spaces after the comma between fields and thus /* This table doesn't use spaces after the comma between fields and thus
* violates CodingStyle. However, I don't really think wrapping it around will * violates CodingStyle. However, I don't really think wrapping it around will
...@@ -1937,6 +1939,9 @@ static int cm4000_attach(struct pcmcia_device *p_dev) ...@@ -1937,6 +1939,9 @@ static int cm4000_attach(struct pcmcia_device *p_dev)
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
cm4000_config(link, i); cm4000_config(link, i);
class_device_create(cmm_class, NULL, MKDEV(major, i), NULL,
"cmm%d", i);
return 0; return 0;
} }
...@@ -1962,6 +1967,8 @@ static void cm4000_detach(struct pcmcia_device *p_dev) ...@@ -1962,6 +1967,8 @@ static void cm4000_detach(struct pcmcia_device *p_dev)
dev_table[devno] = NULL; dev_table[devno] = NULL;
kfree(dev); kfree(dev);
class_device_destroy(cmm_class, MKDEV(major, devno));
return; return;
} }
...@@ -1995,8 +2002,18 @@ static struct pcmcia_driver cm4000_driver = { ...@@ -1995,8 +2002,18 @@ static struct pcmcia_driver cm4000_driver = {
static int __init cmm_init(void) static int __init cmm_init(void)
{ {
int rc;
printk(KERN_INFO "%s\n", version); printk(KERN_INFO "%s\n", version);
pcmcia_register_driver(&cm4000_driver);
cmm_class = class_create(THIS_MODULE, "cardman_4000");
if (!cmm_class)
return -1;
rc = pcmcia_register_driver(&cm4000_driver);
if (rc < 0)
return rc;
major = register_chrdev(0, DEVICE_NAME, &cm4000_fops); major = register_chrdev(0, DEVICE_NAME, &cm4000_fops);
if (major < 0) { if (major < 0) {
printk(KERN_WARNING MODULE_NAME printk(KERN_WARNING MODULE_NAME
...@@ -2012,6 +2029,7 @@ static void __exit cmm_exit(void) ...@@ -2012,6 +2029,7 @@ static void __exit cmm_exit(void)
printk(KERN_INFO MODULE_NAME ": unloading\n"); printk(KERN_INFO MODULE_NAME ": unloading\n");
pcmcia_unregister_driver(&cm4000_driver); pcmcia_unregister_driver(&cm4000_driver);
unregister_chrdev(major, DEVICE_NAME); unregister_chrdev(major, DEVICE_NAME);
class_destroy(cmm_class);
}; };
module_init(cmm_init); module_init(cmm_init);
......
...@@ -3,12 +3,13 @@ ...@@ -3,12 +3,13 @@
* *
* (c) 2000-2004 Omnikey AG (http://www.omnikey.com/) * (c) 2000-2004 Omnikey AG (http://www.omnikey.com/)
* *
* (C) 2005 Harald Welte <laforge@gnumonks.org> * (C) 2005-2006 Harald Welte <laforge@gnumonks.org>
* - add support for poll() * - add support for poll()
* - driver cleanup * - driver cleanup
* - add waitqueues * - add waitqueues
* - adhere to linux kernel coding style and policies * - adhere to linux kernel coding style and policies
* - support 2.6.13 "new style" pcmcia interface * - support 2.6.13 "new style" pcmcia interface
* - add class interface for udev device creation
* *
* The device basically is a USB CCID compliant device that has been * The device basically is a USB CCID compliant device that has been
* attached to an I/O-Mapped FIFO. * attached to an I/O-Mapped FIFO.
...@@ -53,7 +54,7 @@ module_param(pc_debug, int, 0600); ...@@ -53,7 +54,7 @@ module_param(pc_debug, int, 0600);
#endif #endif
static char *version = static char *version =
"OMNIKEY CardMan 4040 v1.1.0gm4 - All bugs added by Harald Welte"; "OMNIKEY CardMan 4040 v1.1.0gm5 - All bugs added by Harald Welte";
#define CCID_DRIVER_BULK_DEFAULT_TIMEOUT (150*HZ) #define CCID_DRIVER_BULK_DEFAULT_TIMEOUT (150*HZ)
#define CCID_DRIVER_ASYNC_POWERUP_TIMEOUT (35*HZ) #define CCID_DRIVER_ASYNC_POWERUP_TIMEOUT (35*HZ)
...@@ -67,6 +68,7 @@ static char *version = ...@@ -67,6 +68,7 @@ static char *version =
static void reader_release(dev_link_t *link); static void reader_release(dev_link_t *link);
static int major; static int major;
static struct class *cmx_class;
#define BS_READABLE 0x01 #define BS_READABLE 0x01
#define BS_WRITABLE 0x02 #define BS_WRITABLE 0x02
...@@ -696,6 +698,9 @@ static int reader_attach(struct pcmcia_device *p_dev) ...@@ -696,6 +698,9 @@ static int reader_attach(struct pcmcia_device *p_dev)
link->state |= DEV_PRESENT | DEV_CONFIG_PENDING; link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
reader_config(link, i); reader_config(link, i);
class_device_create(cmx_class, NULL, MKDEV(major, i), NULL,
"cmx%d", i);
return 0; return 0;
} }
...@@ -721,6 +726,8 @@ static void reader_detach(struct pcmcia_device *p_dev) ...@@ -721,6 +726,8 @@ static void reader_detach(struct pcmcia_device *p_dev)
dev_table[devno] = NULL; dev_table[devno] = NULL;
kfree(dev); kfree(dev);
class_device_destroy(cmx_class, MKDEV(major, devno));
return; return;
} }
...@@ -755,8 +762,17 @@ static struct pcmcia_driver reader_driver = { ...@@ -755,8 +762,17 @@ static struct pcmcia_driver reader_driver = {
static int __init cm4040_init(void) static int __init cm4040_init(void)
{ {
int rc;
printk(KERN_INFO "%s\n", version); printk(KERN_INFO "%s\n", version);
pcmcia_register_driver(&reader_driver); cmx_class = class_create(THIS_MODULE, "cardman_4040");
if (!cmx_class)
return -1;
rc = pcmcia_register_driver(&reader_driver);
if (rc < 0)
return rc;
major = register_chrdev(0, DEVICE_NAME, &reader_fops); major = register_chrdev(0, DEVICE_NAME, &reader_fops);
if (major < 0) { if (major < 0) {
printk(KERN_WARNING MODULE_NAME printk(KERN_WARNING MODULE_NAME
...@@ -771,6 +787,7 @@ static void __exit cm4040_exit(void) ...@@ -771,6 +787,7 @@ static void __exit cm4040_exit(void)
printk(KERN_INFO MODULE_NAME ": unloading\n"); printk(KERN_INFO MODULE_NAME ": unloading\n");
pcmcia_unregister_driver(&reader_driver); pcmcia_unregister_driver(&reader_driver);
unregister_chrdev(major, DEVICE_NAME); unregister_chrdev(major, DEVICE_NAME);
class_destroy(cmx_class);
} }
module_init(cm4040_init); module_init(cm4040_init);
......
...@@ -445,6 +445,7 @@ static struct pcmcia_device_id ide_ids[] = { ...@@ -445,6 +445,7 @@ static struct pcmcia_device_id ide_ids[] = {
PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728),
PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1),
PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003),
PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443),
PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852),
PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209), PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e), PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
......
...@@ -806,6 +806,7 @@ static struct pcmcia_device_id axnet_ids[] = { ...@@ -806,6 +806,7 @@ static struct pcmcia_device_id axnet_ids[] = {
PCMCIA_DEVICE_MANF_CARD(0x026f, 0x0309), PCMCIA_DEVICE_MANF_CARD(0x026f, 0x0309),
PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1106), PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1106),
PCMCIA_DEVICE_MANF_CARD(0x8a01, 0xc1ab), PCMCIA_DEVICE_MANF_CARD(0x8a01, 0xc1ab),
PCMCIA_DEVICE_PROD_ID12("AmbiCom,Inc.", "Fast Ethernet PC Card(AMB8110)", 0x49b020a7, 0x119cc9fc),
PCMCIA_DEVICE_PROD_ID124("Fast Ethernet", "16-bit PC Card", "AX88190", 0xb4be14e3, 0x9a12eb6a, 0xab9be5ef), PCMCIA_DEVICE_PROD_ID124("Fast Ethernet", "16-bit PC Card", "AX88190", 0xb4be14e3, 0x9a12eb6a, 0xab9be5ef),
PCMCIA_DEVICE_PROD_ID12("ASIX", "AX88190", 0x0959823b, 0xab9be5ef), PCMCIA_DEVICE_PROD_ID12("ASIX", "AX88190", 0x0959823b, 0xab9be5ef),
PCMCIA_DEVICE_PROD_ID12("Billionton", "LNA-100B", 0x552ab682, 0xbc3b87e1), PCMCIA_DEVICE_PROD_ID12("Billionton", "LNA-100B", 0x552ab682, 0xbc3b87e1),
......
...@@ -877,7 +877,6 @@ static struct pcmcia_device_id hostap_cs_ids[] = { ...@@ -877,7 +877,6 @@ static struct pcmcia_device_id hostap_cs_ids[] = {
PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777), PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777),
PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000), PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000),
PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002), PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002),
PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002),
PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002), PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002),
PCMCIA_DEVICE_MANF_CARD(0x026f, 0x030b), PCMCIA_DEVICE_MANF_CARD(0x026f, 0x030b),
PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612), PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612),
...@@ -891,6 +890,10 @@ static struct pcmcia_device_id hostap_cs_ids[] = { ...@@ -891,6 +890,10 @@ static struct pcmcia_device_id hostap_cs_ids[] = {
PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002), PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),
PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005), PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010), PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),
PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "INTERSIL",
0x74c5e40d),
PCMCIA_DEVICE_MANF_CARD_PROD_ID1(0x0156, 0x0002, "Intersil",
0x4b801a17),
PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus", PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus",
0x7a954bd9, 0x74be00c6), 0x7a954bd9, 0x74be00c6),
PCMCIA_DEVICE_PROD_ID1234( PCMCIA_DEVICE_PROD_ID1234(
......
...@@ -352,11 +352,20 @@ static void pcmcia_release_dev(struct device *dev) ...@@ -352,11 +352,20 @@ static void pcmcia_release_dev(struct device *dev)
kfree(p_dev); kfree(p_dev);
} }
static void pcmcia_add_pseudo_device(struct pcmcia_socket *s)
{
if (!s->pcmcia_state.device_add_pending) {
s->pcmcia_state.device_add_pending = 1;
schedule_work(&s->device_add);
}
return;
}
static int pcmcia_device_probe(struct device * dev) static int pcmcia_device_probe(struct device * dev)
{ {
struct pcmcia_device *p_dev; struct pcmcia_device *p_dev;
struct pcmcia_driver *p_drv; struct pcmcia_driver *p_drv;
struct pcmcia_device_id *did;
struct pcmcia_socket *s; struct pcmcia_socket *s;
int ret = 0; int ret = 0;
...@@ -392,6 +401,19 @@ static int pcmcia_device_probe(struct device * dev) ...@@ -392,6 +401,19 @@ static int pcmcia_device_probe(struct device * dev)
} }
ret = p_drv->probe(p_dev); ret = p_drv->probe(p_dev);
if (ret)
goto put_module;
/* handle pseudo multifunction devices:
* there are at most two pseudo multifunction devices.
* if we're matching against the first, schedule a
* call which will then check whether there are two
* pseudo devices, and if not, add the second one.
*/
did = (struct pcmcia_device_id *) p_dev->dev.driver_data;
if ((did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) &&
(p_dev->socket->device_count == 1) && (p_dev->device_no == 0))
pcmcia_add_pseudo_device(p_dev->socket);
put_module: put_module:
if (ret) if (ret)
...@@ -660,15 +682,6 @@ static void pcmcia_delayed_add_pseudo_device(void *data) ...@@ -660,15 +682,6 @@ static void pcmcia_delayed_add_pseudo_device(void *data)
s->pcmcia_state.device_add_pending = 0; s->pcmcia_state.device_add_pending = 0;
} }
static inline void pcmcia_add_pseudo_device(struct pcmcia_socket *s)
{
if (!s->pcmcia_state.device_add_pending) {
s->pcmcia_state.device_add_pending = 1;
schedule_work(&s->device_add);
}
return;
}
static int pcmcia_requery(struct device *dev, void * _data) static int pcmcia_requery(struct device *dev, void * _data)
{ {
struct pcmcia_device *p_dev = to_pcmcia_dev(dev); struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
...@@ -755,15 +768,6 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev, ...@@ -755,15 +768,6 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
} }
if (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) { if (did->match_flags & PCMCIA_DEV_ID_MATCH_DEVICE_NO) {
/* handle pseudo multifunction devices:
* there are at most two pseudo multifunction devices.
* if we're matching against the first, schedule a
* call which will then check whether there are two
* pseudo devices, and if not, add the second one.
*/
if (dev->device_no == 0)
pcmcia_add_pseudo_device(dev->socket);
if (dev->device_no != did->device_no) if (dev->device_no != did->device_no)
return 0; return 0;
} }
......
...@@ -72,6 +72,15 @@ ...@@ -72,6 +72,15 @@
.prod_id = { (v1), (v2), (v3), (v4) }, \ .prod_id = { (v1), (v2), (v3), (v4) }, \
.prod_id_hash = { (vh1), (vh2), (vh3), (vh4) }, } .prod_id_hash = { (vh1), (vh2), (vh3), (vh4) }, }
#define PCMCIA_DEVICE_MANF_CARD_PROD_ID1(manf, card, v1, vh1) { \
.match_flags = PCMCIA_DEV_ID_MATCH_MANF_ID| \
PCMCIA_DEV_ID_MATCH_CARD_ID| \
PCMCIA_DEV_ID_MATCH_PROD_ID1, \
.manf_id = (manf), \
.card_id = (card), \
.prod_id = { (v1), NULL, NULL, NULL }, \
.prod_id_hash = { (vh1), 0, 0, 0 }, }
/* multi-function devices */ /* multi-function devices */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment