},
};
-static int clear_instances(int dmm)
+static int dev_clear(int dmm)
{
return std_dev_clear(dmms[dmm].di, NULL);
}
-static int hw_init(struct sr_context *sr_ctx, int dmm)
+static int init(struct sr_context *sr_ctx, int dmm)
{
sr_dbg("Selected '%s' subdriver.", dmms[dmm].di->name);
- return std_hw_init(sr_ctx, dmms[dmm].di, LOG_PREFIX);
+ return std_init(sr_ctx, dmms[dmm].di, LOG_PREFIX);
}
-static GSList *scan(const char *conn, const char *serialcomm, int dmm)
+static GSList *sdmm_scan(const char *conn, const char *serialcomm, int dmm)
{
struct sr_dev_inst *sdi;
struct drv_context *drvc;
return devices;
}
-static GSList *hw_scan(GSList *options, int dmm)
+static GSList *scan(GSList *options, int dmm)
{
struct sr_config *src;
GSList *l, *devices;
if (serialcomm) {
/* Use the provided comm specs. */
- devices = scan(conn, serialcomm, dmm);
+ devices = sdmm_scan(conn, serialcomm, dmm);
} else {
/* Try the default. */
- devices = scan(conn, dmms[dmm].conn, dmm);
+ devices = sdmm_scan(conn, dmms[dmm].conn, dmm);
}
return devices;
}
-static GSList *hw_dev_list(int dmm)
+static GSList *dev_list(int dmm)
{
return ((struct drv_context *)(dmms[dmm].di->priv))->instances;
}
-static int hw_dev_open(struct sr_dev_inst *sdi)
+static int dev_open(struct sr_dev_inst *sdi)
{
struct sr_serial_dev_inst *serial;
return SR_OK;
}
-static int hw_dev_close(struct sr_dev_inst *sdi)
+static int dev_close(struct sr_dev_inst *sdi)
{
struct sr_serial_dev_inst *serial;
return SR_OK;
}
-static int hw_cleanup(int dmm)
+static int cleanup(int dmm)
{
- return clear_instances(dmm);
+ return dev_clear(dmm);
}
static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi)
return SR_OK;
}
-static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi,
+static int dev_acquisition_start(const struct sr_dev_inst *sdi,
void *cb_data, int dmm)
{
struct dev_context *devc;
return SR_OK;
}
-static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
{
- return std_hw_dev_acquisition_stop_serial(sdi, cb_data, hw_dev_close,
- sdi->conn, LOG_PREFIX);
+ return std_dev_acquisition_stop_serial(sdi, cb_data, dev_close,
+ sdi->conn, LOG_PREFIX);
}
/* Driver-specific API function wrappers */
#define HW_INIT(X) \
-static int hw_init_##X(struct sr_context *sr_ctx) { return hw_init(sr_ctx, X); }
+static int init_##X(struct sr_context *sr_ctx) { return init(sr_ctx, X); }
#define HW_CLEANUP(X) \
-static int hw_cleanup_##X(void) { return hw_cleanup(X); }
+static int cleanup_##X(void) { return cleanup(X); }
#define HW_SCAN(X) \
-static GSList *hw_scan_##X(GSList *options) { return hw_scan(options, X); }
+static GSList *scan_##X(GSList *options) { return scan(options, X); }
#define HW_DEV_LIST(X) \
-static GSList *hw_dev_list_##X(void) { return hw_dev_list(X); }
-#define CLEAR_INSTANCES(X) \
-static int clear_instances_##X(void) { return clear_instances(X); }
+static GSList *dev_list_##X(void) { return dev_list(X); }
+#define HW_DEV_CLEAR(X) \
+static int dev_clear_##X(void) { return dev_clear(X); }
#define HW_DEV_ACQUISITION_START(X) \
-static int hw_dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \
-void *cb_data) { return hw_dev_acquisition_start(sdi, cb_data, X); }
+static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \
+void *cb_data) { return dev_acquisition_start(sdi, cb_data, X); }
/* Driver structs and API function wrappers */
#define DRV(ID, ID_UPPER, NAME, LONGNAME) \
HW_CLEANUP(ID_UPPER) \
HW_SCAN(ID_UPPER) \
HW_DEV_LIST(ID_UPPER) \
-CLEAR_INSTANCES(ID_UPPER) \
+HW_DEV_CLEAR(ID_UPPER) \
HW_DEV_ACQUISITION_START(ID_UPPER) \
SR_PRIV struct sr_dev_driver ID##_driver_info = { \
.name = NAME, \
.longname = LONGNAME, \
.api_version = 1, \
- .init = hw_init_##ID_UPPER, \
- .cleanup = hw_cleanup_##ID_UPPER, \
- .scan = hw_scan_##ID_UPPER, \
- .dev_list = hw_dev_list_##ID_UPPER, \
- .dev_clear = clear_instances_##ID_UPPER, \
+ .init = init_##ID_UPPER, \
+ .cleanup = cleanup_##ID_UPPER, \
+ .scan = scan_##ID_UPPER, \
+ .dev_list = dev_list_##ID_UPPER, \
+ .dev_clear = dev_clear_##ID_UPPER, \
.config_get = NULL, \
.config_set = config_set, \
.config_list = config_list, \
- .dev_open = hw_dev_open, \
- .dev_close = hw_dev_close, \
- .dev_acquisition_start = hw_dev_acquisition_start_##ID_UPPER, \
- .dev_acquisition_stop = hw_dev_acquisition_stop, \
+ .dev_open = dev_open, \
+ .dev_close = dev_close, \
+ .dev_acquisition_start = dev_acquisition_start_##ID_UPPER, \
+ .dev_acquisition_stop = dev_acquisition_stop, \
.priv = NULL, \
};