From ab34156b900e0166a75d03ceb6f36e4a7cc92415 Mon Sep 17 00:00:00 2001 From: Gerhard Sittig Date: Sat, 5 Nov 2016 16:55:45 +0100 Subject: [PATCH] serial-dmm: sort the list of device drivers (part 7, group metex14) This commit puts 'metex14' meters into one group. Item order is kept to reduce the diff size and simplify verification. --- src/hardware/serial-dmm/api.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c index 1f19c7d0..3c80ec21 100644 --- a/src/hardware/serial-dmm/api.c +++ b/src/hardware/serial-dmm/api.c @@ -413,7 +413,7 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, &sr_fs9922_z1_diode ), /* }}} */ - /* meters based on other chips (to get sorted) */ + /* metex14 based meters {{{ */ DMM( "bbcgm-2010", metex14, "BBC Goertz Metrawatt", "M2110", "1200/7n2", 1200, @@ -477,13 +477,6 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, sr_metex14_packet_valid, sr_metex14_parse, NULL ), - DMM( - "radioshack-22-812", rs9lcd, - "RadioShack", "22-812", "4800/8n1/rts=0/dtr=1", 4800, - RS9LCD_PACKET_SIZE, 0, 0, NULL, - sr_rs9lcd_packet_valid, sr_rs9lcd_parse, - NULL - ), DMM( "voltcraft-m3650cr", metex14, "Voltcraft", "M-3650CR", "1200/7n2/rts=0/dtr=1", 1200, @@ -512,6 +505,15 @@ SR_REGISTER_DEV_DRIVER_LIST(serial_dmm_drivers, sr_metex14_packet_valid, sr_metex14_parse, NULL ), + /* }}} */ + /* meters based on other chips (to get sorted) */ + DMM( + "radioshack-22-812", rs9lcd, + "RadioShack", "22-812", "4800/8n1/rts=0/dtr=1", 4800, + RS9LCD_PACKET_SIZE, 0, 0, NULL, + sr_rs9lcd_packet_valid, sr_rs9lcd_parse, + NULL + ), DMM( "voltcraft-vc870-ser", vc870, "Voltcraft", "VC-870 (UT-D02 cable)", "9600/8n1/rts=0/dtr=1",