---

yaml --- r: 114147 b: refs/heads/master c: 9c8b796 h: refs/heads/master i: 114145: 84b271a 114143: ed6d66d v: v3
git-mirror · Aug 23, 2008 · 9c4323e · 9c4323e
1 parent bc04b41
commit 9c4323e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 34 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f9c5f4cb7e00d424a56a6431e9c98b3b17851e4
+refs/heads/master: 9c8b7965f594fdff37c59446b9314ed7b4b44d07
diff --git a/trunk/include/pcmcia/cs.h b/trunk/include/pcmcia/cs.h
@@ -287,39 +287,6 @@ typedef struct error_info_t {
 #define CS_EVENT_3VCARD			0x200000
 #define CS_EVENT_XVCARD			0x400000
 
-/* Return codes */
-#define CS_SUCCESS		0x00
-#define CS_BAD_ADAPTER		-ENODEV
-#define CS_BAD_ATTRIBUTE	-EINVAL
-#define CS_BAD_BASE		-EINVAL
-#define CS_BAD_EDC		-ENODEV
-#define CS_BAD_IRQ		-EINVAL
-#define CS_BAD_OFFSET		-EINVAL
-#define CS_BAD_PAGE		-EINVAL
-#define CS_READ_FAILURE		-EIO
-#define CS_BAD_SIZE		-EINVAL
-#define CS_BAD_SOCKET		-EINVAL
-#define CS_BAD_TYPE		-EINVAL
-#define CS_BAD_VCC		-EINVAL
-#define CS_BAD_VPP		-EINVAL
-#define CS_BAD_WINDOW		-ENODEV
-#define CS_WRITE_FAILURE	-EIO
-#define CS_NO_CARD		-ENODEV
-#define CS_UNSUPPORTED_FUNCTION	-ENODEV
-#define CS_UNSUPPORTED_MODE	-ENODEV
-#define CS_BAD_SPEED		-ENODEV
-#define CS_BUSY			-ENODEV
-#define CS_GENERAL_FAILURE	-ETIMEDOUT
-#define CS_WRITE_PROTECTED	-EPERM
-#define CS_BAD_ARG_LENGTH	-ENODEV
-#define CS_BAD_ARGS		-EINVAL
-#define CS_CONFIGURATION_LOCKED	-EACCES
-#define CS_IN_USE		-EBUSY
-#define CS_NO_MORE_ITEMS	-ENOSPC
-#define CS_OUT_OF_RESOURCE	-ENOMEM
-#define CS_BAD_HANDLE		-EINVAL
-
-#define CS_BAD_TUPLE		-EINVAL
 
 #ifdef __KERNEL__
 

diff --git a/trunk/include/pcmcia/ds.h b/trunk/include/pcmcia/ds.h
@@ -138,6 +138,9 @@ typedef union ds_ioctl_arg_t {
 #define DS_UNBIND_REQUEST		_IOW ('d', 63, bind_info_t)
 #define DS_BIND_MTD			_IOWR('d', 64, mtd_info_t)
 
+/* used in userspace only */
+#define CS_IN_USE			0x1e
+
 #ifdef __KERNEL__
 #include <linux/device.h>
 #include <pcmcia/ss.h>