diff options
| author | Vishal Mahaveer <vishalm@ti.com> | 2014-11-10 20:49:29 -0600 |
|---|---|---|
| committer | Thomas Wendt <thoemy@gmx.net> | 2014-11-12 22:13:50 +0100 |
| commit | 8d6603d658b4bb2703a986a8a341946e9f093394 (patch) | |
| tree | b48bf2a296c77e039dddc068b55cf980a5f0d2c9 | |
| parent | d8bf5bbc72910ac88a8dd4cbfcf1d06bee817bdc (diff) | |
| download | android_hardware_ti_wpan-8d6603d658b4bb2703a986a8a341946e9f093394.tar.gz android_hardware_ti_wpan-8d6603d658b4bb2703a986a8a341946e9f093394.tar.bz2 android_hardware_ti_wpan-8d6603d658b4bb2703a986a8a341946e9f093394.zip | |
uim-sysfs: fix build break for lollipop
Fix some redefinitions that were causing build breaks
Change-Id: I8321d065194753bdc00721799f9b6ffca22377cb
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
| -rw-r--r-- | ti_st/uim-sysfs/uim.c | 2 | ||||
| -rw-r--r-- | ti_st/uim-sysfs/uim.h | 16 |
2 files changed, 2 insertions, 16 deletions
diff --git a/ti_st/uim-sysfs/uim.c b/ti_st/uim-sysfs/uim.c index 60e3400..440e56b 100644 --- a/ti_st/uim-sysfs/uim.c +++ b/ti_st/uim-sysfs/uim.c @@ -28,6 +28,8 @@ #include <sys/stat.h> #include <sys/utsname.h> #include "uim.h" +#include <asm-generic/termbits.h> +#include <asm-generic/ioctls.h> #ifdef ANDROID #include <private/android_filesystem_config.h> #include <cutils/log.h> diff --git a/ti_st/uim-sysfs/uim.h b/ti_st/uim-sysfs/uim.h index 1777a3c..201cb01 100644 --- a/ti_st/uim-sysfs/uim.h +++ b/ti_st/uim-sysfs/uim.h @@ -21,12 +21,8 @@ /* Paramaters to set the baud rate*/ #define FLOW_CTL 0x0001 -#define BOTHER 0x00001000 #define ARM_NCCS 19 -#define TCGETS2 _IOR('T',0x2A, struct termios2) -#define TCSETS2 _IOW('T',0x2B, struct termios2) - /*HCI Command and Event information*/ #define HCI_HDR_OPCODE 0xff36 #define WRITE_BD_ADDR_OPCODE 0xFC06 @@ -69,18 +65,6 @@ #endif #endif /* ANDROID */ -/*Termios2 structure for setting the Custom baud rate*/ -struct termios2 { - tcflag_t c_iflag; /* input mode flags */ - tcflag_t c_oflag; /* output mode flags */ - tcflag_t c_cflag; /* control mode flags */ - tcflag_t c_lflag; /* local mode flags */ - cc_t c_line; /* line discipline */ - cc_t c_cc[ARM_NCCS]; /* control characters */ - speed_t c_ispeed; /* input speed */ - speed_t c_ospeed; /* output speed */ -}; - /* HCI command header*/ typedef struct { uint16_t opcode; /* OCF & OGF */ |