diff options
author | Elliott Hughes <enh@google.com> | 2013-11-21 12:48:17 -0800 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2013-11-21 16:30:18 -0800 |
commit | 88d0e0e497af4da9bf571354197755dfe2496484 (patch) | |
tree | c091ae7cd90f460ab17930430d6bc281b5d8d635 /reference-ril/atchannel.c | |
parent | 478bfb9aad83c2c6e91d54c80f88dd44211c2576 (diff) | |
download | android_hardware_ril-88d0e0e497af4da9bf571354197755dfe2496484.tar.gz android_hardware_ril-88d0e0e497af4da9bf571354197755dfe2496484.tar.bz2 android_hardware_ril-88d0e0e497af4da9bf571354197755dfe2496484.zip |
Remove references to <linux/omap_csmi.h>.
This header no longer exists in modern kernels, and it looks like
this code was only meant to be enabled for 'sooner' anyway.
Change-Id: I6e7449a31942a54daa925c14e8843752a835bd42
Diffstat (limited to 'reference-ril/atchannel.c')
-rw-r--r-- | reference-ril/atchannel.c | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/reference-ril/atchannel.c b/reference-ril/atchannel.c index ee13f19..12ca496 100644 --- a/reference-ril/atchannel.c +++ b/reference-ril/atchannel.c @@ -33,11 +33,6 @@ #define LOG_TAG "AT" #include <utils/Log.h> -#ifdef HAVE_ANDROID_OS -/* for IOCTL's */ -#include <linux/omap_csmi.h> -#endif /*HAVE_ANDROID_OS*/ - #include "misc.h" #ifdef HAVE_ANDROID_OS @@ -60,10 +55,6 @@ static ATUnsolHandler s_unsolHandler; static char s_ATBuffer[MAX_AT_RESPONSE+1]; static char *s_ATBufferCur = s_ATBuffer; -static int s_ackPowerIoctl; /* true if TTY has android byte-count - handshake for low power*/ -static int s_readCount = 0; - #if AT_DEBUG void AT_DUMP(const char* prefix, const char* buff, int len) { @@ -385,7 +376,6 @@ static const char *readline() if (count > 0) { AT_DUMP( "<< ", p_read, count ); - s_readCount += count; p_read[count] = '\0'; @@ -467,14 +457,6 @@ static void *readerLoop(void *arg) } else { processLine(line); } - -#ifdef HAVE_ANDROID_OS - if (s_ackPowerIoctl > 0) { - /* acknowledge that bytes have been read and processed */ - ioctl(s_fd, OMAP_CSMI_TTY_ACK, &s_readCount); - s_readCount = 0; - } -#endif /*HAVE_ANDROID_OS*/ } onReaderClosed(); @@ -598,40 +580,6 @@ int at_open(int fd, ATUnsolHandler h) s_smsPDU = NULL; sp_response = NULL; - /* Android power control ioctl */ -#ifdef HAVE_ANDROID_OS -#ifdef OMAP_CSMI_POWER_CONTROL - ret = ioctl(fd, OMAP_CSMI_TTY_ENABLE_ACK); - if(ret == 0) { - int ack_count; - int read_count; - int old_flags; - char sync_buf[256]; - old_flags = fcntl(fd, F_GETFL, 0); - fcntl(fd, F_SETFL, old_flags | O_NONBLOCK); - do { - ioctl(fd, OMAP_CSMI_TTY_READ_UNACKED, &ack_count); - read_count = 0; - do { - ret = read(fd, sync_buf, sizeof(sync_buf)); - if(ret > 0) - read_count += ret; - } while(ret > 0 || (ret < 0 && errno == EINTR)); - ioctl(fd, OMAP_CSMI_TTY_ACK, &ack_count); - } while(ack_count > 0 || read_count > 0); - fcntl(fd, F_SETFL, old_flags); - s_readCount = 0; - s_ackPowerIoctl = 1; - } - else - s_ackPowerIoctl = 0; - -#else // OMAP_CSMI_POWER_CONTROL - s_ackPowerIoctl = 0; - -#endif // OMAP_CSMI_POWER_CONTROL -#endif /*HAVE_ANDROID_OS*/ - pthread_attr_init (&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); |