valentineus/0xFFFF
1
Fork 0
Code Releases Activity

nolo_get_hwrev and nolo_set_hwrev - use int16_t

Browse Source
This commit is contained in:
Pali Rohár committed 2012-09-23 12:24:09 +02:00
1 parent 6c220a45fd
commit 863cf8134a
3 files changed
+20 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main.c
+7 -4
View File
@@ -415,6 +415,7 @@ int main(int argc, char **argv) {
struct usb_device_info * usb_dev = NULL; struct usb_device_info * usb_dev = NULL;
int tmp;
char buf[512]; char buf[512];
simulate = 0; simulate = 0;
@@ -958,9 +959,11 @@ int main(int argc, char **argv) {
else else
printf("Device: %s\n", device_to_string(usb_dev->detected_device)); printf("Device: %s\n", device_to_string(usb_dev->detected_device));
buf[0] = 0; tmp = nolo_get_hwrev(usb_dev);
nolo_get_hwrev(usb_dev, buf, sizeof(buf)); if ( tmp <= 0 )
printf("HW revision: %s\n", buf[0] ? buf : "(not detected)"); printf("HW revision: (not detected)\n");
else
printf("HW revision: %d\n", tmp);
if ( buf[0] ) if ( buf[0] )
usb_dev->detected_hwrev = atoi(buf); usb_dev->detected_hwrev = atoi(buf);
@@ -1121,7 +1124,7 @@ int main(int argc, char **argv) {
if ( set_rd_flags ) if ( set_rd_flags )
nolo_set_rd_flags(usb_dev, set_rd_flags_arg); nolo_set_rd_flags(usb_dev, set_rd_flags_arg);
if ( set_hw ) if ( set_hw )
nolo_set_hwrev(usb_dev, set_hw_arg); nolo_set_hwrev(usb_dev, atoi(set_hw_arg));
if ( set_nolo ) if ( set_nolo )
nolo_set_nolo_ver(usb_dev, set_nolo_arg); nolo_set_nolo_ver(usb_dev, set_nolo_arg);
if ( set_kernel ) if ( set_kernel )
src/nolo.c
+11 -5
View File
@@ -680,16 +680,22 @@ int nolo_set_rd_flags(struct usb_device_info * dev, const char * flags) {
} }
int nolo_get_hwrev(struct usb_device_info * dev, char * hwrev, size_t size) { int16_t nolo_get_hwrev(struct usb_device_info * dev) {
return nolo_identify_string(dev, "hw_rev", hwrev, size); char buf[10];
if ( nolo_identify_string(dev, "hw_rev", buf, sizeof(buf)) <= 0 )
return -1;
return atoi(buf);
} }
int nolo_set_hwrev(struct usb_device_info * dev, const char * hwrev) { int nolo_set_hwrev(struct usb_device_info * dev, int16_t hwrev) {
printf("Setting HW revision to: %s\n", hwrev); char buf[9];
return nolo_set_string(dev, "hw_rev", (char *)hwrev); memset(buf, 0, sizeof(buf));
snprintf(buf, 8, "%d", hwrev);
printf("Setting HW revision to: %s\n", buf);
return nolo_set_string(dev, "hw_rev", buf);
} }
src/nolo.h
+2 -2
View File
@@ -44,8 +44,8 @@ int nolo_set_rd_mode(struct usb_device_info * dev, int enable);
int nolo_get_rd_flags(struct usb_device_info * dev, char * flags, size_t size); int nolo_get_rd_flags(struct usb_device_info * dev, char * flags, size_t size);
int nolo_set_rd_flags(struct usb_device_info * dev, const char * flags); int nolo_set_rd_flags(struct usb_device_info * dev, const char * flags);
int nolo_get_hwrev(struct usb_device_info * dev, char * hwrev, size_t size); int16_t nolo_get_hwrev(struct usb_device_info * dev);
int nolo_set_hwrev(struct usb_device_info * dev, const char * hwrev); int nolo_set_hwrev(struct usb_device_info * dev, int16_t hwrev);
int nolo_get_kernel_ver(struct usb_device_info * dev, char * ver, size_t size); int nolo_get_kernel_ver(struct usb_device_info * dev, char * ver, size_t size);
int nolo_set_kernel_ver(struct usb_device_info * dev, const char * ver); int nolo_set_kernel_ver(struct usb_device_info * dev, const char * ver);