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, 34 insertions, 19 deletions

diff --git a/klaptopdaemon/linux/cisreg.h b/klaptopdaemon/linux/cisreg.h
index 48f6f83..ddaad46 100644
--- a/klaptopdaemon/linux/cisreg.h
+++ b/klaptopdaemon/linux/cisreg.h
@@ -1,25 +1,23 @@
 /*
- * cisreg.h 1.11 1998/09/11 08:54:47
+ * cisreg.h
  *
- * 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
- * compliance with the License. You may obtain a copy of the License
- * at http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and
- * limitations under the License. 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
  *
  * 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.
+ *
+ * (C) 1999             David A. Hinds
  */
 
 #ifndef _LINUX_CISREG_H
 #define _LINUX_CISREG_H
 
-/* Offsets from ConfigBase for CIS registers */
+/*
+ * Offsets from ConfigBase for CIS registers
+ */
 #define CISREG_COR		0x00
 #define CISREG_CCSR		0x02
 #define CISREG_PRR		0x04
@@ -38,12 +36,12 @@
 #define COR_MFC_CONFIG_MASK	0x38
 #define COR_FUNC_ENA		0x01
 #define COR_ADDR_DECODE		0x02
-#define COR_IRETQ_ENA		0x04
+#define COR_IREQ_ENA		0x04
 #define COR_LEVEL_REQ		0x40
 #define COR_SOFT_RESET		0x80
 
 /*
- * Card Configuration and tqStatus Register
+ * Card Configuration and Status Register
  */
 #define CCSR_INTR_ACK		0x01
 #define CCSR_INTR_PENDING	0x02
@@ -72,13 +70,13 @@
 #define SCR_COPY_NUM		0x70
 
 /*
- * Extended tqStatus Register
+ * Extended Status Register
  */
-#define ESR_RETQ_ATTN_ENA	0x01
-#define ESR_RETQ_ATTN		0x10
+#define ESR_REQ_ATTN_ENA	0x01
+#define ESR_REQ_ATTN		0x10
 
 /*
- * CardBus Function tqStatus Registers
+ * CardBus Function Status Registers
  */
 #define CBFN_EVENT		0x00
 #define CBFN_MASK		0x04
@@ -102,4 +100,21 @@
 #define FEMR_PWM_ENA		0x0040
 #define FEMR_WKUP_MASK		0x4000
 
+/*
+ * Indirect Addressing Registers for Zoomed Video: these are addresses
+ * in common memory space
+ */
+#define CISREG_ICTRL0		0x02	/* control registers */
+#define CISREG_ICTRL1		0x03
+#define CISREG_IADDR0		0x04	/* address registers */
+#define CISREG_IADDR1		0x05
+#define CISREG_IADDR2		0x06
+#define CISREG_IADDR3		0x07
+#define CISREG_IDATA0		0x08	/* data registers */
+#define CISREG_IDATA1		0x09
+
+#define ICTRL0_COMMON		0x01
+#define ICTRL0_AUTOINC		0x02
+#define ICTRL0_BYTEGRAN		0x04
+
 #endif /* _LINUX_CISREG_H */