BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add a struct sr_context * parameter to hw_init()

This commit is contained in:
Peter Stuge 2012-12-03 02:47:55 +01:00 committed by Bert Vermeulen
parent 44fc870c9c
commit 34f06b903e
19 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hardware/agilent-dmm/api.c
View File

@ -94,7 +94,7 @@ static int clear_instances(void)
return SR_OK; return SR_OK;
} }
static int hw_init(void) static int hw_init(struct sr_context *sr_ctx)
{ {
struct drv_context *drvc; struct drv_context *drvc;

2
hardware/alsa/alsa.c
View File

@ -75,7 +75,7 @@ struct context {
void *session_dev_id; void *session_dev_id;
}; };
static int hw_init(void) static int hw_init(struct sr_context *sr_ctx)
{ {
struct sr_dev_inst *sdi; struct sr_dev_inst *sdi;
struct context *ctx; struct context *ctx;

2
hardware/asix-sigma/asix-sigma.c
View File

@ -432,7 +432,7 @@ static int clear_instances(void)
return SR_OK; return SR_OK;
} }
static int hw_init(void) static int hw_init(struct sr_context *sr_ctx)
{ {
struct drv_context *drvc; struct drv_context *drvc;

2
hardware/chronovu-la8/api.c
View File

@ -68,7 +68,7 @@ static int clear_instances(void)
return SR_OK; return SR_OK;
} }
static int hw_init(void) static int hw_init(struct sr_context *sr_ctx)
{ {
struct drv_context *drvc; struct drv_context *drvc;

2
hardware/colead-slm/api.c
View File

@ -77,7 +77,7 @@ static int clear_instances(void)
return SR_OK; return SR_OK;
} }
static int hw_init(void) static int hw_init(struct sr_context *sr_ctx)
{ {
struct drv_context *drvc; struct drv_context *drvc;

2
hardware/demo/demo.c
View File

@ -153,7 +153,7 @@ static int clear_instances(void)
return SR_OK; return SR_OK;
} }
static int hw_init(void) static int hw_init(struct sr_context *sr_ctx)
{ {
struct drv_context *drvc; struct drv_context *drvc;

2
hardware/fluke-dmm/api.c
View File

@ -81,7 +81,7 @@ static int clear_instances(void)
return SR_OK; return SR_OK;
} }
static int hw_init(void) static int hw_init(struct sr_context *sr_ctx)
{ {
struct drv_context *drvc; struct drv_context *drvc;

2
hardware/fx2lafw/fx2lafw.c
View File

@ -399,7 +399,7 @@ static int clear_instances(void)
* API callbacks * API callbacks
*/ */
static int hw_init(void) static int hw_init(struct sr_context *sr_ctx)
{ {
struct drv_context *drvc; struct drv_context *drvc;

2
hardware/hantek-dso/api.c
View File

@ -253,7 +253,7 @@ static int clear_instances(void)
return SR_OK; return SR_OK;
} }
static int hw_init(void) static int hw_init(struct sr_context *sr_ctx)
{ {
struct drv_context *drvc; struct drv_context *drvc;

2
hardware/link-mso19/link-mso19.c
View File

@ -401,7 +401,7 @@ static int mso_parse_serial(const char *iSerial, const char *iProduct,
return SR_OK; return SR_OK;
} }
static int hw_init(void) static int hw_init(struct sr_context *sr_ctx)
{ {
/* Nothing to do. */ /* Nothing to do. */

2
hardware/openbench-logic-sniffer/ols.c
View File

@ -362,7 +362,7 @@ static struct sr_dev_inst *get_metadata(struct sr_serial_dev_inst *serial)
return sdi; return sdi;
} }
static int hw_init(void) static int hw_init(struct sr_context *sr_ctx)
{ {
struct drv_context *drvc; struct drv_context *drvc;

46
hardware/serial-dmm/api.c
View File

@ -169,7 +169,7 @@ static int clear_instances(void)
return SR_OK; return SR_OK;
} }
static int hw_init(int dmm) static int hw_init(struct sr_context *sr_ctx, int dmm)
{ {
struct drv_context *drvc; struct drv_context *drvc;
@ -207,59 +207,59 @@ static int hw_init(int dmm)
return SR_OK; return SR_OK;
} }
static int hw_init_digitek_dt4000zc(void) static int hw_init_digitek_dt4000zc(struct sr_context *sr_ctx)
{ {
return hw_init(DIGITEK_DT4000ZC); return hw_init(sr_ctx, DIGITEK_DT4000ZC);
} }
static int hw_init_tekpower_tp4000zc(void) static int hw_init_tekpower_tp4000zc(struct sr_context *sr_ctx)
{ {
return hw_init(TEKPOWER_TP4000ZC); return hw_init(sr_ctx, TEKPOWER_TP4000ZC);
} }
static int hw_init_metex_me31(void) static int hw_init_metex_me31(struct sr_context *sr_ctx)
{ {
return hw_init(METEX_ME31); return hw_init(sr_ctx, METEX_ME31);
} }
static int hw_init_peaktech_3410(void) static int hw_init_peaktech_3410(struct sr_context *sr_ctx)
{ {
return hw_init(PEAKTECH_3410); return hw_init(sr_ctx, PEAKTECH_3410);
} }
static int hw_init_mastech_mas345(void) static int hw_init_mastech_mas345(struct sr_context *sr_ctx)
{ {
return hw_init(MASTECH_MAS345); return hw_init(sr_ctx, MASTECH_MAS345);
} }
static int hw_init_va_va18b(void) static int hw_init_va_va18b(struct sr_context *sr_ctx)
{ {
return hw_init(VA_VA18B); return hw_init(sr_ctx, VA_VA18B);
} }
static int hw_init_metex_m3640d(void) static int hw_init_metex_m3640d(struct sr_context *sr_ctx)
{ {
return hw_init(METEX_M3640D); return hw_init(sr_ctx, METEX_M3640D);
} }
static int hw_init_peaktech_4370(void) static int hw_init_peaktech_4370(struct sr_context *sr_ctx)
{ {
return hw_init(PEAKTECH_4370); return hw_init(sr_ctx, PEAKTECH_4370);
} }
static int hw_init_pce_pce_dm32(void) static int hw_init_pce_pce_dm32(struct sr_context *sr_ctx)
{ {
return hw_init(PCE_PCE_DM32); return hw_init(sr_ctx, PCE_PCE_DM32);
} }
static int hw_init_radioshack_22_168(void) static int hw_init_radioshack_22_168(struct sr_context *sr_ctx)
{ {
return hw_init(RADIOSHACK_22_168); return hw_init(sr_ctx, RADIOSHACK_22_168);
} }
static int hw_init_radioshack_22_812(void) static int hw_init_radioshack_22_812(struct sr_context *sr_ctx)
{ {
return hw_init(RADIOSHACK_22_812); return hw_init(sr_ctx, RADIOSHACK_22_812);
} }
static GSList *scan(const char *conn, const char *serialcomm, int dmm) static GSList *scan(const char *conn, const char *serialcomm, int dmm)

2
hardware/tondaj-sl-814/api.c
View File

@ -73,7 +73,7 @@ static int clear_instances(void)
return SR_OK; return SR_OK;
} }
static int hw_init(void) static int hw_init(struct sr_context *sr_ctx)
{ {
struct drv_context *drvc; struct drv_context *drvc;

10
hardware/uni-t-dmm/api.c
View File

@ -53,7 +53,7 @@ static int clear_instances(void)
return SR_OK; return SR_OK;
} }
static int hw_init(int dmm) static int hw_init(struct sr_context *sr_ctx, int dmm)
{ {
int ret; int ret;
struct drv_context *drvc; struct drv_context *drvc;
@ -80,14 +80,14 @@ static int hw_init(int dmm)
return SR_OK; return SR_OK;
} }
static int hw_init_ut61d(void) static int hw_init_ut61d(struct sr_context *sr_ctx)
{ {
return hw_init(UNI_T_UT61D); return hw_init(sr_ctx, UNI_T_UT61D);
} }
static int hw_init_vc820(void) static int hw_init_vc820(struct sr_context *sr_ctx)
{ {
return hw_init(VOLTCRAFT_VC820); return hw_init(sr_ctx, VOLTCRAFT_VC820);
} }
static GSList *hw_scan(GSList *options) static GSList *hw_scan(GSList *options)

2
hardware/victor-dmm/api.c
View File

@ -76,7 +76,7 @@ static int clear_instances(void)
return SR_OK; return SR_OK;
} }
static int hw_init(void) static int hw_init(struct sr_context *sr_ctx)
{ {
struct drv_context *drvc; struct drv_context *drvc;

2
hardware/zeroplus-logic-cube/zeroplus.c
View File

@ -303,7 +303,7 @@ static int clear_instances(void)
* API callbacks * API callbacks
*/ */
static int hw_init(void) static int hw_init(struct sr_context *sr_ctx)
{ {
struct drv_context *drvc; struct drv_context *drvc;

2
hwdriver.c
View File

@ -222,7 +222,7 @@ SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver)
{ {
if (driver->init) if (driver->init)
return driver->init(); return driver->init(ctx);
return SR_OK; return SR_OK;
} }

2
libsigrok.h
View File

@ -605,7 +605,7 @@ struct sr_dev_driver {
char *name; char *name;
char *longname; char *longname;
int api_version; int api_version;
int (*init) (void); int (*init) (struct sr_context *sr_ctx);
int (*cleanup) (void); int (*cleanup) (void);
GSList *(*scan) (GSList *options); GSList *(*scan) (GSList *options);
GSList *(*dev_list) (void); GSList *(*dev_list) (void);

4
session_driver.c
View File

@ -117,8 +117,10 @@ static int receive_data(int fd, int revents, void *cb_data)
/* driver callbacks */ /* driver callbacks */
static int hw_cleanup(void); static int hw_cleanup(void);
static int hw_init(void) static int hw_init(struct sr_context *sr_ctx)
{ {
(void)sr_ctx;
return SR_OK; return SR_OK;
} }