summaryrefslogtreecommitdiffstats
path: root/klaptopdaemon/linux
diff options
context:
space:
mode:
Diffstat (limited to 'klaptopdaemon/linux')
-rw-r--r--klaptopdaemon/linux/bulkmem.h32
-rw-r--r--klaptopdaemon/linux/ciscode.h10
-rw-r--r--klaptopdaemon/linux/cisreg.h12
-rw-r--r--klaptopdaemon/linux/cistpl.h8
-rw-r--r--klaptopdaemon/linux/cs.h66
-rw-r--r--klaptopdaemon/linux/k_compat.h10
-rw-r--r--klaptopdaemon/linux/ss.h8
7 files changed, 73 insertions, 73 deletions
diff --git a/klaptopdaemon/linux/bulkmem.h b/klaptopdaemon/linux/bulkmem.h
index e0bafc8..cb59aa5 100644
--- a/klaptopdaemon/linux/bulkmem.h
+++ b/klaptopdaemon/linux/bulkmem.h
@@ -71,7 +71,7 @@ typedef struct eraseq_hdr_t {
eraseq_entry_t *QueueEntryArray;
} eraseq_hdr_t;
-#define ERASE_QUEUED 0x00
+#define ERASE_TQUEUED 0x00
#define ERASE_IN_PROGRESS(n) (((n) > 0) && ((n) < 0x80))
#define ERASE_IDLE 0xff
#define ERASE_PASSED 0xe0
@@ -125,25 +125,25 @@ typedef struct mtd_request_t {
u_int TransferLength;
u_int Function;
u_long MediaID;
- u_int Status;
+ u_int tqStatus;
u_int Timeout;
} mtd_request_t;
/* Fields in MTD Function */
-#define MTD_REQ_ACTION 0x003
-#define MTD_REQ_ERASE 0x000
-#define MTD_REQ_READ 0x001
-#define MTD_REQ_WRITE 0x002
-#define MTD_REQ_COPY 0x003
-#define MTD_REQ_NOERASE 0x004
-#define MTD_REQ_VERIFY 0x008
-#define MTD_REQ_READY 0x010
-#define MTD_REQ_TIMEOUT 0x020
-#define MTD_REQ_LAST 0x040
-#define MTD_REQ_FIRST 0x080
-#define MTD_REQ_KERNEL 0x100
-
-/* Status codes */
+#define MTD_RETQ_ACTION 0x003
+#define MTD_RETQ_ERASE 0x000
+#define MTD_RETQ_READ 0x001
+#define MTD_RETQ_WRITE 0x002
+#define MTD_RETQ_COPY 0x003
+#define MTD_RETQ_NOERASE 0x004
+#define MTD_RETQ_VERIFY 0x008
+#define MTD_RETQ_READY 0x010
+#define MTD_RETQ_TIMEOUT 0x020
+#define MTD_RETQ_LAST 0x040
+#define MTD_RETQ_FIRST 0x080
+#define MTD_RETQ_KERNEL 0x100
+
+/* tqStatus codes */
#define MTD_WAITREQ 0x00
#define MTD_WAITTIMER 0x01
#define MTD_WAITRDY 0x02
diff --git a/klaptopdaemon/linux/ciscode.h b/klaptopdaemon/linux/ciscode.h
index 1c536d1..622b923 100644
--- a/klaptopdaemon/linux/ciscode.h
+++ b/klaptopdaemon/linux/ciscode.h
@@ -66,7 +66,7 @@
#define PRODID_OLICOM_OC2232 0x3222
#define MANFID_OMEGA 0x0137
-#define PRODID_OMEGA_QSP_100 0x0025
+#define PRODID_OMEGA_TQSP_100 0x0025
#define MANFID_OSITECH 0x0140
#define PRODID_OSITECH_JACK_144 0x0001
@@ -75,10 +75,10 @@
#define MANFID_PSION 0x016c
-#define MANFID_QUATECH 0x0137
-#define PRODID_QUATECH_DUAL_RS232 0x0012
-#define PRODID_QUATECH_DUAL_RS232_D1 0x0007
-#define PRODID_QUATECH_QUAD_RS232 0x001b
+#define MANFID_TQUATECH 0x0137
+#define PRODID_TQUATECH_DUAL_RS232 0x0012
+#define PRODID_TQUATECH_DUAL_RS232_D1 0x0007
+#define PRODID_TQUATECH_TQUAD_RS232 0x001b
#define MANFID_SMC 0x0108
#define PRODID_SMC_ETHER 0x0105
diff --git a/klaptopdaemon/linux/cisreg.h b/klaptopdaemon/linux/cisreg.h
index ebe54fc..48f6f83 100644
--- a/klaptopdaemon/linux/cisreg.h
+++ b/klaptopdaemon/linux/cisreg.h
@@ -38,12 +38,12 @@
#define COR_MFC_CONFIG_MASK 0x38
#define COR_FUNC_ENA 0x01
#define COR_ADDR_DECODE 0x02
-#define COR_IREQ_ENA 0x04
+#define COR_IRETQ_ENA 0x04
#define COR_LEVEL_REQ 0x40
#define COR_SOFT_RESET 0x80
/*
- * Card Configuration and Status Register
+ * Card Configuration and tqStatus Register
*/
#define CCSR_INTR_ACK 0x01
#define CCSR_INTR_PENDING 0x02
@@ -72,13 +72,13 @@
#define SCR_COPY_NUM 0x70
/*
- * Extended Status Register
+ * Extended tqStatus Register
*/
-#define ESR_REQ_ATTN_ENA 0x01
-#define ESR_REQ_ATTN 0x10
+#define ESR_RETQ_ATTN_ENA 0x01
+#define ESR_RETQ_ATTN 0x10
/*
- * CardBus Function Status Registers
+ * CardBus Function tqStatus Registers
*/
#define CBFN_EVENT 0x00
#define CBFN_MASK 0x04
diff --git a/klaptopdaemon/linux/cistpl.h b/klaptopdaemon/linux/cistpl.h
index 8fee55b..6fab93a 100644
--- a/klaptopdaemon/linux/cistpl.h
+++ b/klaptopdaemon/linux/cistpl.h
@@ -312,7 +312,7 @@ typedef struct cistpl_ide_interface_t {
/* First feature byte */
#define CISTPL_IDE_SILICON 0x04
-#define CISTPL_IDE_UNIQUE 0x08
+#define CISTPL_IDE_UNITQUE 0x08
#define CISTPL_IDE_DUAL 0x10
/* Second feature byte */
@@ -353,7 +353,7 @@ typedef struct cistpl_bar_t {
typedef struct cistpl_config_t {
u_char last_idx;
u_int base;
- u_int rmask[4];
+ u_int rtqmask[4];
u_char subtuples;
} cistpl_config_t;
@@ -398,8 +398,8 @@ typedef struct cistpl_io_t {
} cistpl_io_t;
typedef struct cistpl_irq_t {
- u_int IRQInfo1;
- u_int IRQInfo2;
+ u_int IRTQInfo1;
+ u_int IRTQInfo2;
} cistpl_irq_t;
#define CISTPL_MEM_MAX_WIN 8
diff --git a/klaptopdaemon/linux/cs.h b/klaptopdaemon/linux/cs.h
index b8610ca..69a38e0 100644
--- a/klaptopdaemon/linux/cs.h
+++ b/klaptopdaemon/linux/cs.h
@@ -62,11 +62,11 @@ typedef struct adjust_t {
#define RES_IO_RANGE 2
#define RES_IRQ 3
/* Attribute field */
-#define RES_IRQ_TYPE 0x03
-#define RES_IRQ_TYPE_EXCLUSIVE 0
-#define RES_IRQ_TYPE_TIME 1
-#define RES_IRQ_TYPE_DYNAMIC 2
-#define RES_IRQ_CSC 0x04
+#define RES_IRTQ_TYPE 0x03
+#define RES_IRTQ_TYPE_EXCLUSIVE 0
+#define RES_IRTQ_TYPE_TIME 1
+#define RES_IRTQ_TYPE_DYNAMIC 2
+#define RES_IRTQ_CSC 0x04
#define RES_SHARED 0x08
#define RES_RESERVED 0x10
#define RES_ALLOCATED 0x20
@@ -96,11 +96,11 @@ typedef struct config_info_t {
u_int Vcc, Vpp1, Vpp2;
u_int IntType;
u_int ConfigBase;
- u_char Status, Pin, Copy, Option, ExtStatus;
+ u_char tqStatus, Pin, Copy, Option, ExttqStatus;
u_int Present;
u_int CardValues;
u_int AssignedIRQ;
- u_int IRQAttributes;
+ u_int IRTQAttributes;
ioaddr_t BasePort1;
ioaddr_t NumPorts1;
u_int Attributes1;
@@ -143,7 +143,7 @@ typedef struct modconf_t {
} modconf_t;
/* Attributes for ModifyConfiguration */
-#define CONF_IRQ_CHANGE_VALID 0x100
+#define CONF_IRTQ_CHANGE_VALID 0x100
#define CONF_VCC_CHANGE_VALID 0x200
#define CONF_VPP1_CHANGE_VALID 0x400
#define CONF_VPP2_CHANGE_VALID 0x800
@@ -154,7 +154,7 @@ typedef struct config_req_t {
u_int Vcc, Vpp1, Vpp2;
u_int IntType;
u_int ConfigBase;
- u_char Status, Pin, Copy, ExtStatus;
+ u_char tqStatus, Pin, Copy, ExttqStatus;
u_char ConfigIndex;
u_int Present;
} config_req_t;
@@ -194,36 +194,36 @@ typedef struct io_req_t {
typedef struct irq_req_t {
u_int Attributes;
u_int AssignedIRQ;
- u_int IRQInfo1, IRQInfo2;
+ u_int IRTQInfo1, IRTQInfo2;
void *Handler;
void *Instance;
} irq_req_t;
/* Attributes for RequestIRQ and ReleaseIRQ */
-#define IRQ_TYPE 0x03
-#define IRQ_TYPE_EXCLUSIVE 0x00
-#define IRQ_TYPE_TIME 0x01
-#define IRQ_TYPE_DYNAMIC_SHARING 0x02
-#define IRQ_FORCED_PULSE 0x04
-#define IRQ_FIRST_SHARED 0x08
-#define IRQ_HANDLE_PRESENT 0x10
-#define IRQ_PULSE_ALLOCATED 0x100
-
-/* Bits in IRQInfo1 field */
-#define IRQ_MASK 0x0f
-#define IRQ_NMI_ID 0x01
-#define IRQ_IOCK_ID 0x02
-#define IRQ_BERR_ID 0x04
-#define IRQ_VEND_ID 0x08
-#define IRQ_INFO2_VALID 0x10
-#define IRQ_LEVEL_ID 0x20
-#define IRQ_PULSE_ID 0x40
-#define IRQ_SHARE_ID 0x80
-
-typedef struct eventmask_t {
+#define IRTQ_TYPE 0x03
+#define IRTQ_TYPE_EXCLUSIVE 0x00
+#define IRTQ_TYPE_TIME 0x01
+#define IRTQ_TYPE_DYNAMIC_SHARING 0x02
+#define IRTQ_FORCED_PULSE 0x04
+#define IRTQ_FIRST_SHARED 0x08
+#define IRTQ_HANDLE_PRESENT 0x10
+#define IRTQ_PULSE_ALLOCATED 0x100
+
+/* Bits in IRTQInfo1 field */
+#define IRTQ_MASK 0x0f
+#define IRTQ_NMI_ID 0x01
+#define IRTQ_IOCK_ID 0x02
+#define IRTQ_BERR_ID 0x04
+#define IRTQ_VEND_ID 0x08
+#define IRTQ_INFO2_VALID 0x10
+#define IRTQ_LEVEL_ID 0x20
+#define IRTQ_PULSE_ID 0x40
+#define IRTQ_SHARE_ID 0x80
+
+typedef struct eventtqmask_t {
u_int Attributes;
u_int EventMask;
-} eventmask_t;
+} eventtqmask_t;
#define CONF_EVENT_MASK_VALID 0x01
@@ -407,7 +407,7 @@ enum service {
GetClientInfo, GetConfigurationInfo, GetEventMask,
GetFirstClient, GetFirstPartion, GetFirstRegion, GetFirstTuple,
GetNextClient, GetNextPartition, GetNextRegion, GetNextTuple,
- GetStatus, GetTupleData, MapLogSocket, MapLogWindow, MapMemPage,
+ GettqStatus, GetTupleData, MapLogSocket, MapLogWindow, MapMemPage,
MapPhySocket, MapPhyWindow, ModifyConfiguration, ModifyWindow,
OpenMemory, ParseTuple, ReadMemory, RegisterClient,
RegisterEraseQueue, RegisterMTD, RegisterTimer,
diff --git a/klaptopdaemon/linux/k_compat.h b/klaptopdaemon/linux/k_compat.h
index 2b14312..d18eaa5 100644
--- a/klaptopdaemon/linux/k_compat.h
+++ b/klaptopdaemon/linux/k_compat.h
@@ -124,19 +124,19 @@
#endif
#if (LINUX_VERSION_CODE < VERSION(2,1,51))
-#define INVALIDATE_INODES(r) invalidate_inodes(r)
+#define INVALIDATE_INODES(r) tqinvalidate_inodes(r)
#else
#define INVALIDATE_INODES(r) \
do { struct super_block *sb = get_super(r); \
- if (sb) invalidate_inodes(sb); } while (0)
+ if (sb) tqinvalidate_inodes(sb); } while (0)
#endif
#if (LINUX_VERSION_CODE < VERSION(2,1,60))
-#define IRQ_MAP(irq, dev) irq2dev_map[irq] = dev
+#define IRTQ_MAP(irq, dev) irq2dev_map[irq] = dev
#define FOPS(i,f,b,c,p) (i,f,b,c)
#define FPOS (file->f_pos)
#else
-#define IRQ_MAP(irq, dev) while (0)
+#define IRTQ_MAP(irq, dev) while (0)
#define FOPS(i,f,b,c,p) (f,b,c,p)
#define FPOS (*ppos)
#endif
@@ -240,7 +240,7 @@
#endif
typedef unsigned long k_time_t;
-#define ACQUIRE_RESOURCE_LOCK do {} while (0)
+#define ACTQUIRE_RESOURCE_LOCK do {} while (0)
#define RELEASE_RESOURCE_LOCK do {} while (0)
#endif /* _LINUX_K_COMPAT_H */
diff --git a/klaptopdaemon/linux/ss.h b/klaptopdaemon/linux/ss.h
index 57ad769..b9dbb39 100644
--- a/klaptopdaemon/linux/ss.h
+++ b/klaptopdaemon/linux/ss.h
@@ -25,7 +25,7 @@ typedef struct ss_callback_t {
void *info;
} ss_callback_t;
-/* Definitions for card status flags for GetStatus */
+/* Definitions for card status flags for GettqStatus */
#define SS_WRPROT 0x0001
#define SS_CARDLOCK 0x0002
#define SS_EJECTION 0x0004
@@ -44,7 +44,7 @@ typedef struct ss_callback_t {
/* for InquireSocket */
typedef struct socket_cap_t {
u_int features;
- u_int irq_mask;
+ u_int irq_tqmask;
u_int map_size;
u_char pci_irq;
u_char cardbus;
@@ -56,7 +56,7 @@ typedef struct socket_cap_t {
/* for GetSocket, SetSocket */
typedef struct socket_state_t {
u_int flags;
- u_int csc_mask;
+ u_int csc_tqmask;
u_char Vcc, Vpp;
u_char io_irq;
} socket_state_t;
@@ -105,7 +105,7 @@ typedef struct cb_bridge_map {
enum ss_service {
SS_RegisterCallback, SS_InquireSocket,
- SS_GetStatus, SS_GetSocket, SS_SetSocket,
+ SS_GettqStatus, SS_GetSocket, SS_SetSocket,
SS_GetIOMap, SS_SetIOMap, SS_GetMemMap, SS_SetMemMap,
SS_GetBridge, SS_SetBridge, SS_ProcSetup
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 20:51:18 +0000