Fix GPL/MPL license incompatibility in klaptopdaemon by replacing all MPL licensed files in kdeutils/klaptopdaemon with GPL or dual licensed copies from the Internet

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeutils@1254856 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 37 insertions, 9 deletions

diff --git a/klaptopdaemon/linux/ss.h b/klaptopdaemon/linux/ss.h
index f7030d0..d6ec6da 100644
--- a/klaptopdaemon/linux/ss.h
+++ b/klaptopdaemon/linux/ss.h
@@ -1,8 +1,8 @@
 /*
- * ss.h 1.18 1998/10/01 20:54:49
+ * ss.h 1.28 2000/06/12 21:55:40
  *
  * The contents of this file are subject to the Mozilla Public License
- * Version 1.0 (the "License"); you may not use this file except in
+ * Version 1.1 (the "License"); you may not use this file except in
  * compliance with the License. You may obtain a copy of the License
  * at http://www.mozilla.org/MPL/
  *
@@ -12,8 +12,22 @@
  * limitations under the License. 
  *
  * The initial developer of the original code is David A. Hinds
- * <dhinds@hyper.stanford.edu>.  Portions created by David A. Hinds
- * are Copyright (C) 1998 David A. Hinds.  All Rights Reserved.
+ * <dahinds@users.sourceforge.net>.  Portions created by David A. Hinds
+ * are Copyright (C) 1999 David A. Hinds.  All Rights Reserved.
+ *
+ * Contributor:  Apple Computer, Inc.  Portions � 2000 Apple Computer, 
+ * Inc. All rights reserved.
+ *
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU Public License version 2 (the "GPL"), in which
+ * case the provisions of the GPL are applicable instead of the
+ * above.  If you wish to allow the use of your version of this file
+ * only under the terms of the GPL and not to allow others to use
+ * your version of this file under the MPL, indicate your decision by
+ * deleting the provisions above and replace them with the notice and
+ * other provisions required by the GPL.  If you do not delete the
+ * provisions above, a recipient may use your version of this file
+ * under either the MPL or the GPL.
  */
 
 #ifndef _LINUX_SS_H
@@ -25,7 +39,7 @@ typedef struct ss_callback_t {
     void	*info;
 } ss_callback_t;
 
-/* Definitions for card status flags for GettqStatus */
+/* Definitions for card status flags for GetStatus */
 #define SS_WRPROT	0x0001
 #define SS_CARDLOCK	0x0002
 #define SS_EJECTION	0x0004
@@ -40,6 +54,7 @@ typedef struct ss_callback_t {
 #define SS_CARDBUS	0x0800
 #define SS_3VCARD	0x1000
 #define SS_XVCARD	0x2000
+#define SS_PENDING	0x4000
 
 /* for InquireSocket */
 typedef struct socket_cap_t {
@@ -48,10 +63,23 @@ typedef struct socket_cap_t {
     u_int	map_size;
     u_char	pci_irq;
     u_char	cardbus;
+#ifdef __MACOSX__
+    IOPCIDevice		*bridge_nub;
+    IOPCCardBridge	*pccard_nub;
+    IOCardBusDevice	*cardbus_nub[8];
+#else
+    struct pci_bus *cb_bus;
+    struct bus_operations *bus;
+#endif
 } socket_cap_t;
 
-/* InquireSocket features */
-#define SS_HAS_PAGE_REGS	0x0001
+/* InquireSocket capabilities */
+#define SS_CAP_PAGE_REGS	0x0001
+#define SS_CAP_VIRTUAL_BUS	0x0002
+#define SS_CAP_MEM_ALIGN	0x0004
+#define SS_CAP_STATIC_MAP	0x0008
+#define SS_CAP_PCCARD		0x4000
+#define SS_CAP_CARDBUS		0x8000
 
 /* for GetSocket, SetSocket */
 typedef struct socket_state_t {
@@ -61,7 +89,7 @@ typedef struct socket_state_t {
     u_char	io_irq;
 } socket_state_t;
 
-/* Various card configuration flags */
+/* Socket configuration flags */
 #define SS_PWR_AUTO	0x0010
 #define SS_IOCARD	0x0020
 #define SS_RESET	0x0040
@@ -105,7 +133,7 @@ typedef struct cb_bridge_map {
 
 enum ss_service {
     SS_RegisterCallback, SS_InquireSocket,
-    SS_GettqStatus, SS_GetSocket, SS_SetSocket,
+    SS_GetStatus, SS_GetSocket, SS_SetSocket,
     SS_GetIOMap, SS_SetIOMap, SS_GetMemMap, SS_SetMemMap,
     SS_GetBridge, SS_SetBridge, SS_ProcSetup
 };