GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-06 06:37:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PATCH] pcmcia: match for fake CIS

Browse source 
Add another match flag for devices needing a CIS override.  The driver will
only probe/attach if the CIS has been replaced before.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Dominik Brodowski 2005-06-27 16:28:07 -07:00 • committed by Linus Torvalds
parent 23a83bfe6a
commit ea7b38825b
3 changed files with 84 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/pcmcia/ds.c
View file

@ -733,6 +733,14 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
return 0; return 0;
} }
if (did->match_flags & PCMCIA_DEV_ID_MATCH_FAKE_CIS) {
if (!dev->socket->fake_cis) {
/* FIXME: evaluate using firmware helpers to
* automagically load it from userspace */
return 0;
}
}
dev->dev.driver_data = (void *) did; dev->dev.driver_data = (void *) did;
return 1; return 1;

2
include/linux/mod_devicetable.h
View file

@ -196,6 +196,7 @@ struct pcmcia_device_id {
/* not matched against */ /* not matched against */
kernel_ulong_t driver_info; kernel_ulong_t driver_info;
char * cisfile;
}; };
#define PCMCIA_DEV_ID_MATCH_MANF_ID 0x0001 #define PCMCIA_DEV_ID_MATCH_MANF_ID 0x0001
@ -207,5 +208,6 @@ struct pcmcia_device_id {
#define PCMCIA_DEV_ID_MATCH_PROD_ID3 0x0040 #define PCMCIA_DEV_ID_MATCH_PROD_ID3 0x0040
#define PCMCIA_DEV_ID_MATCH_PROD_ID4 0x0080 #define PCMCIA_DEV_ID_MATCH_PROD_ID4 0x0080
#define PCMCIA_DEV_ID_MATCH_DEVICE_NO 0x0100 #define PCMCIA_DEV_ID_MATCH_DEVICE_NO 0x0100
#define PCMCIA_DEV_ID_MATCH_FAKE_CIS 0x0200
#endif /* LINUX_MOD_DEVICETABLE_H */ #endif /* LINUX_MOD_DEVICETABLE_H */

74
include/pcmcia/device_id.h
View file

@ -171,5 +171,79 @@
.prod_id_hash = { (vh1), (vh2), (vh3), 0 }, \ .prod_id_hash = { (vh1), (vh2), (vh3), 0 }, \
.device_no = (mfc), } .device_no = (mfc), }
/* cards needing a CIS override */
#define PCMCIA_DEVICE_CIS_MANF_CARD(manf, card, _cisfile) { \
.match_flags = PCMCIA_DEV_ID_MATCH_FAKE_CIS | \
PCMCIA_DEV_ID_MATCH_MANF_ID| \
PCMCIA_DEV_ID_MATCH_CARD_ID, \
.manf_id = (manf), \
.card_id = (card), \
.cisfile = (_cisfile)}
#define PCMCIA_DEVICE_CIS_PROD_ID12(v1, v2, vh1, vh2, _cisfile) { \
.match_flags = PCMCIA_DEV_ID_MATCH_FAKE_CIS | \
PCMCIA_DEV_ID_MATCH_PROD_ID1| \
PCMCIA_DEV_ID_MATCH_PROD_ID2, \
.prod_id = { (v1), (v2), NULL, NULL }, \
.prod_id_hash = { (vh1), (vh2), 0, 0 }, \
.cisfile = (_cisfile)}
#define PCMCIA_DEVICE_CIS_PROD_ID123(v1, v2, v3, vh1, vh2, vh3, _cisfile) { \
.match_flags = PCMCIA_DEV_ID_MATCH_FAKE_CIS | \
PCMCIA_DEV_ID_MATCH_PROD_ID1| \
PCMCIA_DEV_ID_MATCH_PROD_ID2| \
PCMCIA_DEV_ID_MATCH_PROD_ID3, \
.prod_id = { (v1), (v2), (v3), NULL },\
.prod_id_hash = { (vh1), (vh2), (vh3), 0 }, \
.cisfile = (_cisfile)}
#define PCMCIA_DEVICE_CIS_PROD_ID2(v2, vh2, _cisfile) { \
.match_flags = PCMCIA_DEV_ID_MATCH_FAKE_CIS | \
PCMCIA_DEV_ID_MATCH_PROD_ID2, \
.prod_id = { NULL, (v2), NULL, NULL }, \
.prod_id_hash = { 0, (vh2), 0, 0 }, \
.cisfile = (_cisfile)}
#define PCMCIA_PFC_DEVICE_CIS_PROD_ID12(mfc, v1, v2, vh1, vh2, _cisfile) { \
.match_flags = PCMCIA_DEV_ID_MATCH_FAKE_CIS | \
PCMCIA_DEV_ID_MATCH_PROD_ID1| \
PCMCIA_DEV_ID_MATCH_PROD_ID2| \
PCMCIA_DEV_ID_MATCH_DEVICE_NO, \
.prod_id = { (v1), (v2), NULL, NULL }, \
.prod_id_hash = { (vh1), (vh2), 0, 0 },\
.device_no = (mfc), \
.cisfile = (_cisfile)}
#define PCMCIA_MFC_DEVICE_CIS_MANF_CARD(mfc, manf, card, _cisfile) { \
.match_flags = PCMCIA_DEV_ID_MATCH_FAKE_CIS | \
PCMCIA_DEV_ID_MATCH_MANF_ID| \
PCMCIA_DEV_ID_MATCH_CARD_ID| \
PCMCIA_DEV_ID_MATCH_FUNCTION, \
.manf_id = (manf), \
.card_id = (card), \
.function = (mfc), \
.cisfile = (_cisfile)}
#define PCMCIA_MFC_DEVICE_CIS_PROD_ID12(mfc, v1, v2, vh1, vh2, _cisfile) { \
.match_flags = PCMCIA_DEV_ID_MATCH_FAKE_CIS | \
PCMCIA_DEV_ID_MATCH_PROD_ID1| \
PCMCIA_DEV_ID_MATCH_PROD_ID2| \
PCMCIA_DEV_ID_MATCH_FUNCTION, \
.prod_id = { (v1), (v2), NULL, NULL }, \
.prod_id_hash = { (vh1), (vh2), 0, 0 }, \
.function = (mfc), \
.cisfile = (_cisfile)}
#define PCMCIA_MFC_DEVICE_CIS_PROD_ID4(mfc, v4, vh4, _cisfile) { \
.match_flags = PCMCIA_DEV_ID_MATCH_FAKE_CIS | \
PCMCIA_DEV_ID_MATCH_PROD_ID4| \
PCMCIA_DEV_ID_MATCH_FUNCTION, \
.prod_id = { NULL, NULL, NULL, (v4) }, \
.prod_id_hash = { 0, 0, 0, (vh4) }, \
.function = (mfc), \
.cisfile = (_cisfile)}
#define PCMCIA_DEVICE_NULL { .match_flags = 0, } #define PCMCIA_DEVICE_NULL { .match_flags = 0, }