log prefixes: Cosmetics, consistency fixes, typo fixes.

[libsigrok.git] / hwdriver.c

diff --git a/hwdriver.c b/hwdriver.c
index 5897b63eb823f6509bba1fe98a53731d671698d6..83582ad2310abeb7c3bf9210a6cca41fc7ebf231 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -27,14 +27,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "hwdriver: "
-#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
-#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
-#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
-#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
-#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
-#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+#define LOG_PREFIX "hwdriver"
 
 /**
  * @file
@@ -107,6 +100,9 @@ static struct sr_config_info sr_config_info_data[] = {
 };
 
 /** @cond PRIVATE */
+#ifdef HAVE_HW_APPA_55II
+extern SR_PRIV struct sr_dev_driver appa_55ii_driver_info;
+#endif
 #ifdef HAVE_HW_BRYMEN_DMM
 extern SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
 #endif
@@ -126,6 +122,9 @@ extern SR_PRIV struct sr_dev_driver demo_driver_info;
 #ifdef HAVE_HW_GMC_MH_1X_2X
 extern SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info;
 #endif
+#ifdef HAVE_HW_HAMEG_HMO
+extern SR_PRIV struct sr_dev_driver hameg_hmo_driver_info;
+#endif
 #ifdef HAVE_HW_IKALOGIC_SCANALOGIC2
 extern SR_PRIV struct sr_dev_driver ikalogic_scanalogic2_driver_info;
 #endif
@@ -148,8 +147,8 @@ extern SR_PRIV struct sr_dev_driver norma_dmm_driver_info;
 #ifdef HAVE_HW_OLS
 extern SR_PRIV struct sr_dev_driver ols_driver_info;
 #endif
-#ifdef HAVE_HW_RIGOL_DS1XX2
-extern SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info;
+#ifdef HAVE_HW_RIGOL_DS
+extern SR_PRIV struct sr_dev_driver rigol_ds_driver_info;
 #endif
 #ifdef HAVE_HW_SALEAE_LOGIC16
 extern SR_PRIV struct sr_dev_driver saleae_logic16_driver_info;
@@ -194,6 +193,7 @@ extern SR_PRIV struct sr_dev_driver agdmm_driver_info;
 extern SR_PRIV struct sr_dev_driver flukedmm_driver_info;
 #endif
 #ifdef HAVE_HW_SERIAL_DMM
+extern SR_PRIV struct sr_dev_driver bbcgm_m2110_driver_info;
 extern SR_PRIV struct sr_dev_driver digitek_dt4000zc_driver_info;
 extern SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info;
 extern SR_PRIV struct sr_dev_driver metex_me31_driver_info;
@@ -233,6 +233,9 @@ extern SR_PRIV struct sr_dev_driver tenma_72_7745_driver_info;
 /** @endcond */
 
 static struct sr_dev_driver *drivers_list[] = {
+#ifdef HAVE_HW_APPA_55II
+       &appa_55ii_driver_info,
+#endif
 #ifdef HAVE_HW_BRYMEN_DMM
        &brymen_bm857_driver_info,
 #endif
@@ -252,6 +255,9 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_GMC_MH_1X_2X
        &gmc_mh_1x_2x_rs232_driver_info,
 #endif
+#ifdef HAVE_HW_HAMEG_HMO
+       &hameg_hmo_driver_info,
+#endif
 #ifdef HAVE_HW_IKALOGIC_SCANALOGIC2
        &ikalogic_scanalogic2_driver_info,
 #endif
@@ -274,8 +280,8 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_OLS
        &ols_driver_info,
 #endif
-#ifdef HAVE_HW_RIGOL_DS1XX2
-       &rigol_ds1xx2_driver_info,
+#ifdef HAVE_HW_RIGOL_DS
+       &rigol_ds_driver_info,
 #endif
 #ifdef HAVE_HW_SALEAE_LOGIC16
        &saleae_logic16_driver_info,
@@ -320,6 +326,7 @@ static struct sr_dev_driver *drivers_list[] = {
        &flukedmm_driver_info,
 #endif
 #ifdef HAVE_HW_SERIAL_DMM
+       &bbcgm_m2110_driver_info,
        &digitek_dt4000zc_driver_info,
        &tekpower_tp4000zc_driver_info,
        &metex_me31_driver_info,