X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=275f30d9a02df6a72440a9acc2d84ccfeadd2454;hb=95ecc765463462938200cf5cbcffba663f893c29;hp=5897b63eb823f6509bba1fe98a53731d671698d6;hpb=5e1f7c890d099ba47fca543936417a94f989445f;p=libsigrok.git diff --git a/hwdriver.c b/hwdriver.c index 5897b63e..275f30d9 100644 --- a/hwdriver.c +++ b/hwdriver.c @@ -126,6 +126,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 +151,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 +197,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; @@ -252,6 +256,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 +281,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 +327,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,