Import and convert IR driver from OSD1 tree

arch/arm/configs/ntosd_644xA_defconfig

@@ -676,7 +676,8 @@ CONFIG_KEYBOARD_XTKBD=y
 # CONFIG_INPUT_JOYSTICK is not set
 # CONFIG_INPUT_TABLET is not set
 # CONFIG_INPUT_TOUCHSCREEN is not set
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_NEUROS_IR=m
 
 #
 # Hardware I/O ports
@@ -763,6 +764,7 @@ CONFIG_GPIOEXPANDER_DAVINCI=y
 # CONFIG_I2C_DEBUG_ALGO is not set
 # CONFIG_I2C_DEBUG_BUS is not set
 # CONFIG_I2C_DEBUG_CHIP is not set
+CONFIG_I2C_NEUROS_MSP430=m
 
 #
 # SPI support

drivers/input/misc/Kconfig

@@ -183,4 +183,17 @@ config HP_SDC_RTC
 	  Say Y here if you want to support the built-in real time clock
 	  of the HP SDC controller.
 
+config INPUT_NEUROS_IR
+	tristate "Neuros IR driver"
+	depends on ARCH_DAVINCI
+	help
+	  This option enables the Neuros IR driver.
+	  
+	  FIXME: This needs a better description.
+	  
+	  To compile this driver as a module (recommended), choose M here: the
+	  module will be called neuros_ir.
+	  
+	  If unsure and targeting the Neuros OSD, say M.
+
 endif

drivers/input/misc/Makefile

@@ -18,3 +18,4 @@ obj-$(CONFIG_INPUT_POWERMATE)		+= powermate.o
 obj-$(CONFIG_INPUT_YEALINK)		+= yealink.o
 obj-$(CONFIG_HP_SDC_RTC)		+= hp_sdc_rtc.o
 obj-$(CONFIG_INPUT_UINPUT)		+= uinput.o
+obj-$(CONFIG_INPUT_NEUROS_IR)		+= neuros_ir.o

drivers/input/misc/neuros_keymaps.h

+/*
+ *  Copyright(C) 2006-2007 Neuros Technology International LLC. 
+ *               <www.neurostechnology.com>
+ *
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 2 of the License.
+ *
+ *  This program is distributed in the hope that, in addition to its 
+ *  original purpose to support Neuros hardware, it will be useful 
+ *  otherwise, but WITHOUT ANY WARRANTY; without even the implied 
+ *  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ ****************************************************************************
+ *
+ * IR Receiver driver / key mappings file
+ *
+ * TODO: support 2 different mappings (current keyboard-area mapping and another mapping which uses media keys)
+ * TODO: make the 2 mappings switchable via ioctl. Maybe allow remapping at runtime via ioctl.
+ *
+ */
+
+#define NUM_KEYS 36
+
+static int keymap[NUM_KEYS] = {
+    0,                //0
+    KEY_KP1,          //1
+    KEY_KP2,          //2
+    KEY_KP3,          //3
+    KEY_KP4,          //4
+    KEY_KP5,          //5
+    KEY_KP6,          //6
+    KEY_KP7,          //7
+    KEY_KP8,          //8
+    KEY_KP9,          //9
+    KEY_KP0,          //10
+    0,                //11
+    0,                //12
+    0,                //13
+    0,                //14
+    KEY_KPASTERISK,   //15    "*"
+    KEY_KPDOT,        //16    "#"  //this was the only way.
+    KEY_PAGEUP,       //17    CHAN_UP
+    KEY_PAGEDOWN,     //18    CHAN_DN
+    KEY_BACKSPACE,    //19    BACK
+    KEY_ESC,          //20    HOME 
+    KEY_UP,           //21    UP
+    KEY_DOWN,         //22    DOWN
+    KEY_LEFT,         //23    LEFT
+    KEY_RIGHT,        //24    RIGHT
+    KEY_ENTER,        //25    ENTER
+    KEY_H,            //26    HELP  // no better idea than H
+    KEY_TAB,          //27    XIM   // TAB seems just better than X, no other reason
+    KEY_U,            //28    UNLABELED_1  //this is a tiny "Unknown" and "Unlabeled" tiny key on remote
+    KEY_KPMINUS,      //29    REW
+    KEY_KPPLUS,       //30    FFW
+    KEY_SPACE,        //31    PLAY  //Most media apps use space for quick pause/play
+    KEY_HOME,         //32    PREV
+    KEY_END,          //33    NEXT
+    KEY_DELETE,       //34    STOP
+    KEY_INSERT        //35    RECORD
+};
+

include/linux/neuros_ir.h

+#ifndef NEUROS_IR__H
+#define NEUROS_IR__H
+/*
+ *  Copyright(C) 2006-2007 Neuros Technology International LLC. 
+ *               <www.neurostechnology.com>
+ *
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 2 of the License.
+ *
+ *  This program is distributed in the hope that, in addition to its 
+ *  original purpose to support Neuros hardware, it will be useful 
+ *  otherwise, but WITHOUT ANY WARRANTY; without even the implied 
+ *  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ ****************************************************************************
+ *
+ * IR Receiver driver header.
+ *
+ */
+#ifdef __KERNEL__
+    #include <linux/types.h>
+    extern int i2c_write(uint8_t reg, uint16_t value);
+    extern int i2c_read(uint8_t reg);
+#else
+    #include <stdint.h>
+#endif
+   
+#define regIR                   0x40  // IR receiver register.
+#define NEUROS_IR_MAJOR 110
+#define NEUROS_IR_IOC_MAGIC 'i'
+#define NULL_KEY 0xff
+#define LEARNING_COMPLETE_KEY 0x3e
+#define RELEASE_REMOTE_KEY 0x29
+#define TEST_KEY 0x3f
+#define UP_KEY 0x00
+
+#endif /* NEUROS_IR__H */
+

include/linux/neuros_ir_blaster.h

+#ifndef NEUROS_IR_BLASTER__H
+#define NEUROS_IR_BLASTER__H
+/*
+ *  Copyright(C) 2006-2007 Neuros Technology International LLC. 
+ *               <www.neurostechnology.com>
+ *
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 2 of the License.
+ *
+ *  This program is distributed in the hope that, in addition to its 
+ *  original purpose to support Neuros hardware, it will be useful 
+ *  otherwise, but WITHOUT ANY WARRANTY; without even the implied 
+ *  warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+ *  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ ****************************************************************************
+ *
+ * IR Blaster driver header.
+ *
+ */
+#ifdef __KERNEL__
+    #include <linux/types.h>
+    extern int i2c_write(uint8_t reg, uint16_t value);
+    extern int i2c_read(uint8_t reg);
+#else
+    #include <stdint.h>
+#endif
+
+#define BLASTER_THROUGH_ARM
+#define GIO3 0x0008
+#define KEY_MASK 0xff
+#define NEUROS_IR_BLASTER_MAJOR 111
+#define NEUROS_IR_BLASTER_IOC_MAGIC 'b'
+
+#define the_same(x,y,p) \
+        ((((x)*100<=(y)*(100+(p)))&&((y)*100<=(x)*(100+(p))))?1:0)
+
+#define SIMILAR_PRECISION 20 /*averaged off x% difference.*/
+#define the_similar(x,y) the_same(x,y,SIMILAR_PRECISION)
+
+#define CAPTRUE_PRECISION1 10 /*averaged off x% difference.*/
+#define the_same1(x,y) the_same(x,y,CAPTRUE_PRECISION1)
+
+#define CAPTRUE_PRECISION2 13 /*averaged off x% difference.*/
+#define the_same2(x,y) the_same(x,y,CAPTRUE_PRECISION2)
+
+#define CAPTRUE_PRECISION3 17 /*averaged off x% difference.*/
+#define the_same3(x,y) the_same(x,y,CAPTRUE_PRECISION3)
+
+#ifdef BLASTER_THROUGH_ARM
+#define BLS_START 0
+#define BLS_COMPLETE 1
+#define BLS_ERROR -1
+
+#define BLASTER_MAX_CHANGE	(8*50)  /* maximum edge changes. */
+#define BLASTER_MAX_SBITS       20     /*special edge number min is 6*/
+#define BITS_COUNT_START        0       /*bits count start. */
+#define BITS_COUNT_MASK         (0x3FF<<BITS_COUNT_START)  /*bits count mask. */
+#define FIRST_LEVEL_BIT_START   15      /*bits count start. */
+#define FIRST_LEVEL_BIT_MASK    (1<<FIRST_LEVEL_BIT_START)    /*end flag mask. */
+
+struct blaster_data_type {
+    uint16_t bitstimes;     /*first[15] 1 bit 1=high level  0=low level; 
+                                [0-9]10 bit =how many bits;*/
+
+    uint32_t bits[BLASTER_MAX_CHANGE];  	/*each bit length*/
+};
+
+#else
+
+// I2C command definitions.
+#define cmdBLASTER_SEND         0x18
+/* RRB registers definitions. */
+#define regCMND                 0     // command register.
+#define regBLASTER_DBITS        (0x80+24)  // used to put blaster data(part7)
+#define regBLASTER_MBITS        0x80  // used to put blaster data(part6)
+#define regFLASH_DATA           0x06  // used to put blaster data(part5)
+#define regBLASTER_BIT2         (regBLASTER_DATA+6)  // used to put blaster data(part4)
+#define regBLASTER_BIT1         (regBLASTER_DATA+4)  // used to put blaster data(part3)
+#define regBLASTER_BIT0         (regBLASTER_DATA+2)  // used to put blaster data(part2)
+#define regBLASTER_DATA         0x1C  // used to put blaster data(part1)
+
+#define BLASTER_MAX_CHANGE	(8*24)  /* maximum edge changes. */
+#define BLASTER_MAX_SBITS       8       /*special edge number min is 6*/
+#define BLASTER_MAX_BITS	(8*24)  /*maximum edge changes, use for uncompacted data structure*/
+#define END_COUNT               8       /*number of edges for end bit. */
+#define BITS_COUNT_START        7       /*bits count start. */
+#define END_FLAG_START          6       /*end flag mask. */
+#define BITS_COUNT_MASK         (0xFF<<BITS_COUNT_START)  /*bits count mask. */
+#define END_FLAG_MASK           (1<<END_FLAG_START)       /*end flag mask. */
+#define MAX_REPEAT_TIMES        7       /*bits count start. */
+#define BITS_TIMES_MASK         0xFFF8  /*bits times mask. */
+#define FIRST_LEVEL_BIT_START   15      /*bits count start. */
+#define FIRST_LEVEL_BIT_MASK    (1<<FIRST_LEVEL_BIT_START)    /*end flag mask. */
+
+struct blaster_data_type {
+    uint16_t bitstimes;     /*first[15] 1 bit 1=high level  0=low level; 
+                                [8+BITS_COUNT_START-BITS_COUNT_START]8 bit =how many bits;
+                                [END_FLAG_START] 1=have end bits 0=not have end bits
+                                [2-0]3 bit=how many repeat times*/
+    uint16_t start1;        /*start mark first length */
+    uint16_t start2;        /*start mark second length*/
+    uint16_t interval;      /*interval for each times */
+
+    uint16_t bits[BLASTER_MAX_BITS];  	/*each bit length*/
+    uint16_t end[END_COUNT];
+};
+#endif
+
+struct blaster_data_pack {
+    uint16_t bitstimes;       /*first[15] 1 bit 1=high level  0=low level; 
+                                [7+BITS_COUNT_START-BITS_COUNT_START]8 bit =how many bits;
+                                [END_FLAG_START] 1=have end bits 0=not have end bits
+                                [2-0]3 bit=how many repeat times*/
+    uint32_t  bit0;
+    uint32_t  bit1;
+    uint32_t  bit2;
+
+    uint8_t  mbits[BLASTER_MAX_CHANGE/8];
+    uint8_t  dbits[BLASTER_MAX_CHANGE/8];
+
+    uint32_t  specbits[BLASTER_MAX_SBITS];
+};
+
+#define keybit_set(bi, base, val) \
+	do {\
+		if (val)\
+			*((base) + ((bi) / 8)) |=(1 << ((bi) % 8));\
+		else\
+			*((base) + ((bi) / 8)) &=~(1 << ((bi) % 8));\
+	} while(0)
+
+#define keybit_get(base, bi) \
+			*((base) + ((bi) / 8)) & (1 << ((bi) % 8))
+
+#define RRB_CAPTURE_KEY  _IO(NEUROS_IR_BLASTER_IOC_MAGIC, 7)
+#define RRB_BLASTER_KEY  _IOW(NEUROS_IR_BLASTER_IOC_MAGIC, 8, \
+    struct blaster_data_pack)
+#define RRB_FACTORY_TEST _IO(NEUROS_IR_BLASTER_IOC_MAGIC, 9)
+#define RRB_READ_LEARNING_DATA  _IOR(NEUROS_IR_BLASTER_IOC_MAGIC, 10, \
+    struct blaster_data_type)
+#define RRB_GET_BLASTER_STATUS	_IOR(NEUROS_IR_BLASTER_IOC_MAGIC, 11, \
+    int)
+
+#endif /* NEUROS_IR_BLASTER__H */
+