These char PCMCIA drivers are buggy[1] and receive only minimal care. It was concluded[2], that we should try to remove most pcmcia drivers completely. Let's start with these char broken one. Note that I also removed a UAPI header: include/uapi/linux/cm4000_cs.h. I found only coccinelle tests mentioning some ioctl constants from that file. But they are not actually used. Anyway, should someone complain, we may reintroduce the header (or its parts). [1] https://lore.kernel.org/all/f41c2765-80e0-48bc-b1e4-8cfd3230fd4a@www.fastmail.com/ [2] https://lore.kernel.org/all/c5b39544-a4fb-4796-a046-0b9be9853787@app.fastmail.com/
Showing the changes to include/uapi (1 of 19 files). Show all
Unified · Split
| @@ -1,64 +0,0 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | ||
| 2 | #ifndef _UAPI_CM4000_H_ | ||
| 3 | #define _UAPI_CM4000_H_ | ||
| 4 | |||
| 5 | #include <linux/types.h> | ||
| 6 | #include <linux/ioctl.h> | ||
| 7 | |||
| 8 | #define MAX_ATR 33 | ||
| 9 | |||
| 10 | #define CM4000_MAX_DEV 4 | ||
| 11 | |||
| 12 | /* those two structures are passed via ioctl() from/to userspace. They are | ||
| 13 | * used by existing userspace programs, so I kepth the awkward "bIFSD" naming | ||
| 14 | * not to break compilation of userspace apps. -HW */ | ||
| 15 | |||
| 16 | typedef struct atreq { | ||
| 17 | __s32 atr_len; | ||
| 18 | unsigned char atr[64]; | ||
| 19 | __s32 power_act; | ||
| 20 | unsigned char bIFSD; | ||
| 21 | unsigned char bIFSC; | ||
| 22 | } atreq_t; | ||
| 23 | |||
| 24 | |||
| 25 | /* what is particularly stupid in the original driver is the arch-dependent | ||
| 26 | * member sizes. This leads to CONFIG_COMPAT breakage, since 32bit userspace | ||
| 27 | * will lay out the structure members differently than the 64bit kernel. | ||
| 28 | * | ||
| 29 | * I've changed "ptsreq.protocol" from "unsigned long" to "__u32". | ||
| 30 | * On 32bit this will make no difference. With 64bit kernels, it will make | ||
| 31 | * 32bit apps work, too. | ||
| 32 | */ | ||
| 33 | |||
| 34 | typedef struct ptsreq { | ||
| 35 | __u32 protocol; /*T=0: 2^0, T=1: 2^1*/ | ||
| 36 | unsigned char flags; | ||
| 37 | unsigned char pts1; | ||
| 38 | unsigned char pts2; | ||
| 39 | unsigned char pts3; | ||
| 40 | } ptsreq_t; | ||
| 41 | |||
| 42 | #define CM_IOC_MAGIC 'c' | ||
| 43 | #define CM_IOC_MAXNR 255 | ||
| 44 | |||
| 45 | #define CM_IOCGSTATUS _IOR (CM_IOC_MAGIC, 0, unsigned char *) | ||
| 46 | #define CM_IOCGATR _IOWR(CM_IOC_MAGIC, 1, atreq_t *) | ||
| 47 | #define CM_IOCSPTS _IOW (CM_IOC_MAGIC, 2, ptsreq_t *) | ||
| 48 | #define CM_IOCSRDR _IO (CM_IOC_MAGIC, 3) | ||
| 49 | #define CM_IOCARDOFF _IO (CM_IOC_MAGIC, 4) | ||
| 50 | |||
| 51 | #define CM_IOSDBGLVL _IOW(CM_IOC_MAGIC, 250, int*) | ||
| 52 | |||
| 53 | /* card and device states */ | ||
| 54 | #define CM_CARD_INSERTED 0x01 | ||
| 55 | #define CM_CARD_POWERED 0x02 | ||
| 56 | #define CM_ATR_PRESENT 0x04 | ||
| 57 | #define CM_ATR_VALID 0x08 | ||
| 58 | #define CM_STATE_VALID 0x0f | ||
| 59 | /* extra info only from CM4000 */ | ||
| 60 | #define CM_NO_READER 0x10 | ||
| 61 | #define CM_BAD_CARD 0x20 | ||
| 62 | |||
| 63 | |||
| 64 | #endif /* _UAPI_CM4000_H_ */ | ||