diff options
| -rw-r--r-- | Android.mk | 3 | ||||
| -rw-r--r-- | Application.mk | 3 | ||||
| -rw-r--r-- | rmi4update/Android.mk | 10 | ||||
| -rw-r--r-- | rmi4update/main.cpp | 4 | ||||
| -rw-r--r-- | rmi4update/rmi4update.cpp | 10 | ||||
| -rw-r--r-- | rmidevice/Android.mk | 8 | ||||
| -rw-r--r-- | rmidevice/hiddevice.cpp | 5 | ||||
| -rw-r--r-- | rmihidtool/Android.mk | 10 |
8 files changed, 45 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk new file mode 100644 index 0000000..32094cc --- /dev/null +++ b/Android.mk @@ -0,0 +1,3 @@ +LOCAL_PATH := $(call my-dir) +include $(call all-subdir-makefiles) + diff --git a/Application.mk b/Application.mk new file mode 100644 index 0000000..88fd988 --- /dev/null +++ b/Application.mk @@ -0,0 +1,3 @@ +APP_BUILD_SCRIPT := $(call my-dir)/Android.mk +APP_STL := stlport_static +APP_PLATFORM := android-19
\ No newline at end of file diff --git a/rmi4update/Android.mk b/rmi4update/Android.mk new file mode 100644 index 0000000..04d0ea8 --- /dev/null +++ b/rmi4update/Android.mk @@ -0,0 +1,10 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE := rmi4update +LOCAL_C_INCLUDES := rmidevice +LOCAL_SRC_FILES := main.cpp rmi4update.cpp updateutil.cpp firmware_image.cpp +LOCAL_CPPFLAGS := -Wall +LOCAL_STATIC_LIBRARIES := rmidevice + +include $(BUILD_EXECUTABLE)
\ No newline at end of file diff --git a/rmi4update/main.cpp b/rmi4update/main.cpp index a589d7b..a873e63 100644 --- a/rmi4update/main.cpp +++ b/rmi4update/main.cpp @@ -22,8 +22,8 @@ int main(int argc, char **argv) FirmwareImage image; int opt; int index; - const char *deviceName; - const char *firmwareName; + const char *deviceName = NULL; + const char *firmwareName = NULL; bool force = false; static struct option long_options[] = { {"help", 0, NULL, 'h'}, diff --git a/rmi4update/rmi4update.cpp b/rmi4update/rmi4update.cpp index f4b9bcb..f2818ad 100644 --- a/rmi4update/rmi4update.cpp +++ b/rmi4update/rmi4update.cpp @@ -61,7 +61,7 @@ int RMI4Update::UpdateFirmware(bool force) { struct timespec start; struct timespec end; - int64_t duration_ns = 0; + long long int duration_ns = 0; int rc; const unsigned char eraseAll = RMI_F34_ERASE_ALL; @@ -112,7 +112,7 @@ int RMI4Update::UpdateFirmware(bool force) #if 0 // TODO: convert to userspace duration_ns = timespec_to_ns(&end) - timespec_to_ns(&start); #endif - fprintf(stdout, "Done writing lockdown, time: %ld ns.\n", duration_ns); + fprintf(stdout, "Done writing lockdown, time: %lld ns.\n", duration_ns); } rc = EnterFlashProgramming(); @@ -146,7 +146,7 @@ int RMI4Update::UpdateFirmware(bool force) #if 0 // TODO: convert to userspace duration_ns = timespec_to_ns(&end) - timespec_to_ns(&start); #endif - fprintf(stdout, "Erase complete, time: %ld ns.\n", duration_ns); + fprintf(stdout, "Erase complete, time: %lld ns.\n", duration_ns); if (m_firmwareImage.GetFirmwareData()) { fprintf(stdout, "Writing firmware...\n"); @@ -161,7 +161,7 @@ int RMI4Update::UpdateFirmware(bool force) #if 0 // TODO: convert to userspace duration_ns = timespec_to_ns(&end) - timespec_to_ns(&start); #endif - fprintf(stdout, "Done writing FW, time: %ld ns.\n", duration_ns); + fprintf(stdout, "Done writing FW, time: %lld ns.\n", duration_ns); } if (m_firmwareImage.GetConfigData()) { @@ -177,7 +177,7 @@ int RMI4Update::UpdateFirmware(bool force) #if 0 // TODO: convert to userspace duration_ns = timespec_to_ns(&end) - timespec_to_ns(&start); #endif - fprintf(stdout, "Done writing config, time: %ld ns.\n", duration_ns); + fprintf(stdout, "Done writing config, time: %lld ns.\n", duration_ns); } m_device.Reset(); diff --git a/rmidevice/Android.mk b/rmidevice/Android.mk new file mode 100644 index 0000000..8e23065 --- /dev/null +++ b/rmidevice/Android.mk @@ -0,0 +1,8 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE := rmidevice +LOCAL_SRC_FILES := rmifunction.cpp rmidevice.cpp hiddevice.cpp +LOCAL_CPPFLAGS := -Wall + +include $(BUILD_STATIC_LIBRARY)
\ No newline at end of file diff --git a/rmidevice/hiddevice.cpp b/rmidevice/hiddevice.cpp index 773ca38..433b4d0 100644 --- a/rmidevice/hiddevice.cpp +++ b/rmidevice/hiddevice.cpp @@ -45,6 +45,9 @@ int HIDDevice::Open(const char * filename) int rc; int desc_size; + if (!filename) + return -EINVAL; + m_fd = open(filename, O_RDWR); if (m_fd < 0) return -1; @@ -261,7 +264,7 @@ int HIDDevice::GetAttentionReport(struct timeval * timeout, int *sources, unsign int HIDDevice::GetReport(int reportid, struct timeval * timeout) { - size_t count; + size_t count = 0; unsigned char *queue_report; fd_set fds; int rc; diff --git a/rmihidtool/Android.mk b/rmihidtool/Android.mk new file mode 100644 index 0000000..6a0c965 --- /dev/null +++ b/rmihidtool/Android.mk @@ -0,0 +1,10 @@ +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_MODULE := rmihidtool +LOCAL_C_INCLUDES := rmidevice +LOCAL_SRC_FILES := main.cpp +LOCAL_CPPFLAGS := -Wall +LOCAL_STATIC_LIBRARIES := rmidevice + +include $(BUILD_EXECUTABLE)
\ No newline at end of file |