From: Uwe Hermann Date: Thu, 26 Nov 2015 23:15:15 +0000 (+0100) Subject: Use the ALLZERO macro in more places. X-Git-Tag: libsigrok-0.4.0~102 X-Git-Url: http://sigrok.org/gitweb/?p=libsigrok.git;a=commitdiff_plain;h=9e9dba7b41bdd87d4ce442bc9bf6507518e97000 Use the ALLZERO macro in more places. --- diff --git a/src/hardware/agilent-dmm/sched.c b/src/hardware/agilent-dmm/sched.c index c1ca8f2e..e5c0cc58 100644 --- a/src/hardware/agilent-dmm/sched.c +++ b/src/hardware/agilent-dmm/sched.c @@ -515,7 +515,7 @@ SR_PRIV const struct agdmm_job agdmm_jobs_u12xx[] = { { 143, send_stat }, { 1000, send_conf }, { 143, send_fetc }, - { 0, NULL } + ALL_ZERO }; SR_PRIV const struct agdmm_recv agdmm_recvs_u123x[] = { @@ -525,7 +525,7 @@ SR_PRIV const struct agdmm_recv agdmm_recvs_u123x[] = { { "^\"(V|MV|A|UA|FREQ),(\\d),(AC|DC)\"$", recv_conf_u123x }, { "^\"(RES|CAP),(\\d)\"$", recv_conf_u123x}, { "^\"(DIOD)\"$", recv_conf }, - { NULL, NULL } + ALL_ZERO }; SR_PRIV const struct agdmm_recv agdmm_recvs_u124x[] = { @@ -537,7 +537,7 @@ SR_PRIV const struct agdmm_recv agdmm_recvs_u124x[] = { { "^\"(CPER:[40]-20mA) ([-+][0-9\\.E\\-+]+),([-+][0-9\\.E\\-+]+)\"$", recv_conf_u124x_5x }, { "^\"(T[0-9]:[A-Z]+) ([A-Z]+)\"$", recv_conf_u124x_5x }, { "^\"(DIOD)\"$", recv_conf }, - { NULL, NULL } + ALL_ZERO }; SR_PRIV const struct agdmm_recv agdmm_recvs_u125x[] = { @@ -549,5 +549,5 @@ SR_PRIV const struct agdmm_recv agdmm_recvs_u125x[] = { { "^\"(CPER:[40]-20mA) ([-+][0-9\\.E\\-+]+),([-+][0-9\\.E\\-+]+)\"$", recv_conf_u124x_5x }, { "^\"(T[0-9]:[A-Z]+) ([A-Z]+)\"$", recv_conf_u124x_5x }, { "^\"(DIOD)\"$", recv_conf }, - { NULL, NULL } + ALL_ZERO }; diff --git a/src/hardware/chronovu-la/protocol.c b/src/hardware/chronovu-la/protocol.c index c3340d7c..a4689fa3 100644 --- a/src/hardware/chronovu-la/protocol.c +++ b/src/hardware/chronovu-la/protocol.c @@ -24,7 +24,7 @@ SR_PRIV const struct cv_profile cv_profiles[] = { { CHRONOVU_LA8, "LA8", "ChronoVu LA8", 8, SR_MHZ(100), 2, 0.8388608 }, { CHRONOVU_LA16, "LA16", "ChronoVu LA16", 16, SR_MHZ(200), 4, 0.042 }, - { 0, NULL, NULL, 0, 0, 0, 0.0 }, + ALL_ZERO }; /* LA8: channels are numbered 0-7. LA16: channels are numbered 0-15. */ diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c index 38bbefcb..7eca205c 100644 --- a/src/hardware/korad-kaxxxxp/api.c +++ b/src/hardware/korad-kaxxxxp/api.c @@ -54,7 +54,7 @@ static const struct korad_kaxxxxp_model models[] = { "VELLEMANLABPS3005DV2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}}, {KORAD_KA3005D, "Korad", "KA3005P", "KORADKA3005PV2.0", 1, {0, 31, 0.01}, {0, 5, 0.001}}, - {0, NULL, NULL, NULL, 0, {0, 0, 0}, {0, 0, 0}} + ALL_ZERO }; SR_PRIV struct sr_dev_driver korad_kaxxxxp_driver_info; diff --git a/src/hardware/lascar-el-usb/protocol.c b/src/hardware/lascar-el-usb/protocol.c index ac8b6ff9..2584e8b0 100644 --- a/src/hardware/lascar-el-usb/protocol.c +++ b/src/hardware/lascar-el-usb/protocol.c @@ -52,7 +52,7 @@ static const struct elusb_profile profiles[] = { { 19, "EL-USB-1-LCD", LOG_UNSUPPORTED }, { 20, "EL-OEM-3", LOG_UNSUPPORTED }, { 21, "EL-USB-1-LCD", LOG_UNSUPPORTED }, - { 0, NULL, 0 } + ALL_ZERO }; static libusb_device_handle *lascar_open(struct libusb_device *dev) diff --git a/src/hardware/manson-hcs-3xxx/api.c b/src/hardware/manson-hcs-3xxx/api.c index e79e59dc..917a7c0f 100644 --- a/src/hardware/manson-hcs-3xxx/api.c +++ b/src/hardware/manson-hcs-3xxx/api.c @@ -70,7 +70,7 @@ static const struct hcs_model models[] = { { MANSON_HCS_3600, "HCS-3600-USB", "3600", { 1, 16, 0.1 }, { 0, 60, 0.10 } }, { MANSON_HCS_3602, "HCS-3602-USB", "3602", { 1, 32, 0.1 }, { 0, 30, 0.10 } }, { MANSON_HCS_3604, "HCS-3604-USB", "3604", { 1, 60, 0.1 }, { 0, 15, 0.10 } }, - { 0, NULL, NULL, { 0, 0, 0 }, { 0, 0, 0 }, }, + ALL_ZERO }; SR_PRIV struct sr_dev_driver manson_hcs_3xxx_driver_info; diff --git a/src/hardware/zeroplus-logic-cube/api.c b/src/hardware/zeroplus-logic-cube/api.c index 6a76b3d8..657e5eb2 100644 --- a/src/hardware/zeroplus-logic-cube/api.c +++ b/src/hardware/zeroplus-logic-cube/api.c @@ -51,7 +51,7 @@ static const struct zp_model zeroplus_models[] = { {0x0c12, 0x700e, "LAP-C(16032)", 16, 32, 100}, {0x0c12, 0x7016, "LAP-C(162000)", 16, 2048, 200}, {0x0c12, 0x7100, "AKIP-9101", 16, 256, 200}, - { 0, 0, 0, 0, 0, 0 } + ALL_ZERO }; static const uint32_t devopts[] = { diff --git a/src/hwdriver.c b/src/hwdriver.c index b15fc28f..a676d026 100644 --- a/src/hwdriver.c +++ b/src/hwdriver.c @@ -206,7 +206,7 @@ static struct sr_key_info sr_key_info_config[] = { {SR_CONF_TEST_MODE, SR_T_STRING, "test_mode", "Test mode", NULL}, - {0, 0, NULL, NULL, NULL}, + ALL_ZERO }; /* Please use the same order as in enum sr_mq (libsigrok.h). */