コミット: 4a2ae14c86bc2d9314e99c0577f706442becdfaa - hardware-gps (git)

hardware/gps

コミットメタ情報

• リビジョン: 4a2ae14c86bc2d9314e99c0577f706442becdfaa (tree)
• 日時: 2019-02-22 18:03:06
• 作者: Chih-Wei Huang <cwhuang@linu...>
• コミッター: Chih-Wei Huang

ログメッセージ

Fix building warnings

Remove unused functions.

変更サマリ

• modified: Android.mk
• modified: gps.c
• modified: gps_huawei.c

差分

--- a/Android.mk
+++ b/Android.mk
@@ -11,6 +11,7 @@ LOCAL_MODULE := gps.default
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_SRC_FILES := gps.c
+LOCAL_CFLAGS := -Wno-unused-parameter -Wno-unused-variable
 include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -19,5 +20,6 @@ LOCAL_MODULE := gps.huawei
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_RELATIVE_PATH := hw
 LOCAL_SRC_FILES := gps_huawei.c
+LOCAL_CFLAGS := -Wno-unused-parameter -Wno-unused-variable
 include $(BUILD_SHARED_LIBRARY)
 endif

--- a/gps.c
+++ b/gps.c
@@ -59,11 +59,6 @@ static int    id_in_fixed[12];
 #define GPS_DEV_SLOW_UPDATE_RATE (10)
 #define GPS_DEV_HIGH_UPDATE_RATE (1)
 
-static void gps_dev_init(int fd);
-static void gps_dev_deinit(int fd);
-static void gps_dev_start(int fd);
-static void gps_dev_stop(int fd);
-
 /*****************************************************************/
 /*****************************************************************/
 /*****                                                       *****/
@@ -281,18 +276,6 @@ nmea_reader_init( NmeaReader*  r )
 }
 
 
-static void
-nmea_reader_set_callback( NmeaReader*  r, gps_location_callback  cb )
-{
-    r->callback = cb;
-    if (cb != NULL && r->fix.flags != 0) {
-        D("%s: sending latest fix to new callback", __FUNCTION__);
-        r->callback( &r->fix );
-        r->fix.flags = 0;
-    }
-}
-
-
 static int
 nmea_reader_update_time( NmeaReader*  r, Token  tok )
 {
@@ -822,17 +805,6 @@ epoll_register( int  epoll_fd, int  fd )
 }
 
 
-static int
-epoll_deregister( int  epoll_fd, int  fd )
-{
-    int  ret;
-    do {
-        ret = epoll_ctl( epoll_fd, EPOLL_CTL_DEL, fd, NULL );
-    } while (ret < 0 && errno == EINTR);
-    return ret;
-}
-
-
 /* this is the main thread, it waits for commands from gps_state_start/stop and,
  * when started, messages from the QEMU GPS daemon. these are simple NMEA sentences
  * that must be parsed to be converted into GPS fixes sent to the framework
@@ -875,7 +847,7 @@ gps_state_thread( void*  arg )
                 int  fd = events[ne].data.fd;
 
                 if (fd == control_fd) {
-                    char  cmd = 255;
+                    char  cmd = -1;
                     int   ret;
                     D("GPS control fd event");
                     do {
@@ -1153,134 +1125,6 @@ const GpsInterface* gps_get_hardware_interface()
 /*****************************************************************/
 /*****************************************************************/
 
-static void gps_dev_power(int state)
-{
-    return;
-}
-
-
-static void gps_dev_send(int fd, char *msg)
-{
-    int i, n, ret;
-
-    i = strlen(msg);
-
-    n = 0;
-
-    do {
-
-        ret = write(fd, msg + n, i - n);
-
-        if (ret < 0 && errno == EINTR) {
-            continue;
-        }
-
-        n += ret;
-
-    } while (n < i);
-}
-
-
-static unsigned char gps_dev_calc_nmea_csum(char *msg)
-{
-    unsigned char csum = 0;
-    int i;
-
-    for (i = 1; msg[i] != '*'; ++i) {
-        csum ^= msg[i];
-    }
-
-    return csum;
-}
-
-
-static void gps_dev_set_nmea_message_rate(int fd, char *msg, int rate)
-{
-    char buff[50];
-    int i;
-
-    sprintf(buff, "$PUBX,40,%s,%d,%d,%d,0*", msg, rate, rate, rate);
-
-    i = strlen(buff);
-
-    sprintf((buff + i), "%02x\r\n", gps_dev_calc_nmea_csum(buff));
-
-    gps_dev_send(fd, buff);
-
-    D("GPS sent to device: %s", buff);
-}
-
-
-static void gps_dev_set_baud_rate(int fd, int baud)
-{
-    char buff[50];
-    int i, u;
-
-    for (u = 0; u < 3; ++u) {
-
-        sprintf(buff, "$PUBX,41,%d,0003,0003,%d,0*", u, baud);
-
-        i = strlen(buff);
-
-        sprintf((buff + i), "%02x\r\n", gps_dev_calc_nmea_csum(buff));
-
-        gps_dev_send(fd, buff);
-
-        D("Sent to device: %s", buff);
-
-    }
-}
-
-
-static void gps_dev_set_message_rate(int fd, int rate)
-{
-
-    unsigned int i;
-
-    char *msg[] = {
-                     "GGA", "GLL", "VTG",
-                     "GSA", "GSV", "RMC"
-                  };
-
-    for (i = 0; i < sizeof(msg)/sizeof(msg[0]); ++i) {
-        gps_dev_set_nmea_message_rate(fd, msg[i], rate);
-    }
-
-    return;
-}
-
-
-static void gps_dev_init(int fd)
-{
-    gps_dev_power(1);
-
-    return;
-}
-
-
-static void gps_dev_deinit(int fd)
-{
-    gps_dev_power(0);
-}
-
-
-static void gps_dev_start(int fd)
-{
-    // Set full message rate
-    gps_dev_set_message_rate(fd, GPS_DEV_HIGH_UPDATE_RATE);
-
-    D("GPS dev start initiated");
-}
-
-
-static void gps_dev_stop(int fd)
-{
-    // Set slow message rate
-    gps_dev_set_message_rate(fd, GPS_DEV_SLOW_UPDATE_RATE);
-
-    D("GPS dev stop initiated");
-}
-
 
 static int open_gps(const struct hw_module_t* module, char const* name, struct hw_device_t** device)
 {

--- a/gps_huawei.c
+++ b/gps_huawei.c
@@ -2,7 +2,7 @@
 **
 ** Copyright 2006, The Android Open Source Project
 ** Copyright 2009, Michael Trimarchi <[e-mail]>
-** Copyright 2011, Eduardo José Tagle <[e-mail]>
+** Copyright 2011, Eduardo José Tagle <[e-mail]>
 **
 ** 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
@@ -138,18 +138,6 @@ static void serial_write(int fd, char *msg)
   return;
 }
 
-static unsigned char calc_nmea_csum(char *msg)
-{
-  unsigned char csum = 0;
-  int i;
-
-  for (i = 1; msg[i] != '*'; ++i) {
-    csum ^= msg[i];
-  }
-
-  return csum;
-}
-
 
 /*****************************************************************/
 /*****************************************************************/
@@ -202,43 +190,6 @@ static void dev_power(int state)
 
 }
 
-static void dev_set_nmea_message_rate(int fd,const char *msg, int rate)
-{
-
-  char buff[50];
-  int i;
-
-  sprintf(buff, "$PUBX,40,%s,%d,%d,%d,0*", msg, rate, rate, rate);
-
-  i = strlen(buff);
-
-  sprintf((buff + i), "%02x\r\n", calc_nmea_csum(buff));
-
-  serial_write(fd, buff);
-
-  D("gps sent to device: %s", buff);
-
-  return;
-
-}
-
-static void dev_set_message_rate(int fd, int rate)
-{
-
-  unsigned int i;
-  static const char *msg[] = {
-                 "GGA", "GLL", "ZDA",
-                 "VTG", "GSA", "GSV",
-                 "RMC"
-                };
-
-  for (i = 0; i < sizeof(msg)/sizeof(msg[0]); ++i) {
-        dev_set_nmea_message_rate(fd, msg[i], rate);
-  }
-
-  return;
-}
-
 
 static void dev_start(int fd)
 {
@@ -1014,15 +965,6 @@ static int epoll_register( int  epoll_fd, int  fd )
 }
 
 
-static int epoll_deregister( int  epoll_fd, int  fd )
-{
-    int  ret;
-    do {
-        ret = epoll_ctl( epoll_fd, EPOLL_CTL_DEL, fd, NULL );
-    } while (ret < 0 && errno == EINTR);
-    return ret;
-}
-
 static void gps_nmea_thread_cb( GpsState* state )
 {
     D("%s()", __FUNCTION__ );
@@ -1163,7 +1105,7 @@ static void* gps_state_thread( void* arg )
 
                 if (fd == control_fd)
                 {
-                    char  cmd = 255;
+                    char  cmd = -1;
                     int   ret;
                     D("gps control fd event");
                     do {
@@ -1677,7 +1619,8 @@ static const AGpsInterface  sAGpsInterface = {
     agps_conn_open,
     agps_conn_closed,
     agps_conn_failed,
-    agps_set_server
+    agps_set_server,
+    0
 };
 
 
@@ -1779,6 +1722,6 @@ DLL_PUBLIC struct hw_module_t HAL_MODULE_INFO_SYM = {
     .version_minor = 0,
     .id = GPS_HARDWARE_MODULE_ID,
     .name = "GPS Module",
-    .author = "Eduardo José Tagle",
+    .author = "Eduardo José Tagle",
     .methods = &gps_module_methods,
 };