summaryrefslogtreecommitdiffstats
path: root/klaptopdaemon/linux/ss.h
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-23 01:42:07 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-23 01:42:07 +0000
commita2277b6bc715464e83882b90c2a058139b8a6b54 (patch)
treeab09b14014f59b4d8e2ddd12226aa0b22e4dfc5d /klaptopdaemon/linux/ss.h
parentd3f79e04b34bd1f70a458b81b28fc8799498c8dc (diff)
downloadtdeutils-a2277b6bc715464e83882b90c2a058139b8a6b54.tar.gz
tdeutils-a2277b6bc715464e83882b90c2a058139b8a6b54.zip
TQt4 port kdeutils
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1238125 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'klaptopdaemon/linux/ss.h')
-rw-r--r--klaptopdaemon/linux/ss.h8
1 files changed, 4 insertions, 4 deletions
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
};