X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fhameg-hmo%2Fprotocol.c;h=d014eafe9cec9ac2ae1ad6cf3e83232fdf7f3695;hb=61c39f54bbcae7bdde86ddb11b2fd0ff308d319b;hp=b4807990b1ba16c0f42e7a7a0576958b93b791f0;hpb=23f43dff15abf5202d81f36e062b0ae5b0ca01cd;p=libsigrok.git

diff --git a/hardware/hameg-hmo/protocol.c b/hardware/hameg-hmo/protocol.c
index b4807990..d014eafe 100644
--- a/hardware/hameg-hmo/protocol.c
+++ b/hardware/hameg-hmo/protocol.c
@@ -19,10 +19,6 @@
 
 #include "protocol.h"
 
-static const char *manufacturers[] = {
-	"HAMEG",
-};
-
 static const char *hameg_scpi_dialect[] = {
 	[SCPI_CMD_GET_DIG_DATA]		    = ":POD%d:DATA?",
 	[SCPI_CMD_GET_TIMEBASE]		    = ":TIM:SCAL?",
@@ -256,17 +252,6 @@ static struct scope_config scope_models[] = {
 	},
 };
 
-static int check_manufacturer(const char *manufacturer)
-{
-	unsigned int i;
-
-	for (i = 0; i < ARRAY_SIZE(manufacturers); ++i)
-		if (!strcmp(manufacturer, manufacturers[i]))
-			return SR_OK;
-
-	return SR_ERR;
-}
-
 static void scope_state_dump(struct scope_config *config,
 			     struct scope_state *state)
 {
@@ -560,68 +545,6 @@ SR_PRIV int hmo_init_device(struct sr_dev_inst *sdi)
 	return SR_OK;
 }
 
-SR_PRIV struct sr_dev_inst *hmo_probe_serial_device(const char *serial_device,
-						    const char *serial_options)
-{
-	struct sr_dev_inst *sdi;
-	struct dev_context *devc;
-	struct sr_scpi_hw_info *hw_info;
-	struct sr_scpi_dev_inst *scpi;
-
-	sdi = NULL;
-	devc = NULL;
-	scpi = NULL;
-	hw_info = NULL;
-
-	if (!(scpi = scpi_serial_dev_inst_new(serial_device, serial_options)))
-		goto fail;
-
-	sr_info("Probing %s.", serial_device);
-	if (sr_scpi_open(scpi) != SR_OK)
-		goto fail;
-
-	if (sr_scpi_get_hw_id(scpi, &hw_info) != SR_OK) {
-		sr_info("Couldn't get IDN response.");
-		goto fail;
-	}
-
-	if (check_manufacturer(hw_info->manufacturer) != SR_OK)
-		goto fail;
-
-	if (!(sdi = sr_dev_inst_new(0, SR_ST_ACTIVE,
-				    hw_info->manufacturer, hw_info->model,
-				    hw_info->firmware_version))) {
-		goto fail;
-	}
-	sr_scpi_hw_info_free(hw_info);
-	hw_info = NULL;
-
-	if (!(devc = g_try_malloc0(sizeof(struct dev_context))))
-		goto fail;
-
-	sdi->driver = di;
-	sdi->priv = devc;
-	sdi->inst_type = SR_INST_SCPI;
-	sdi->conn = scpi;
-
-	if (hmo_init_device(sdi) != SR_OK)
-		goto fail;
-
-	return sdi;
-
-fail:
-	if (hw_info)
-		sr_scpi_hw_info_free(hw_info);
-	if (scpi)
-		sr_scpi_free(scpi);
-	if (sdi)
-		sr_dev_inst_free(sdi);
-	if (devc)
-		g_free(devc);
-
-	return NULL;
-}
-
 SR_PRIV int hmo_receive_data(int fd, int revents, void *cb_data)
 {
 	struct sr_probe *probe;