Skip to content

F
FMC ADC 100M 14b 4cha - Software
Commit 415a814e authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

lib: cast token pointer to the final data strucutre 

this will fix g++ warnings and will not affect the gcc and C logic even
if `(void *)` is perfectly legal in C
Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 1cb96634
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
lib/boards.c
View file @ 415a814e
...@@ -134,7 +134,7 @@ struct fmcadc_dev *fmcadc_open_by_lun(char *name, int lun, ...@@ -134,7 +134,7 @@ struct fmcadc_dev *fmcadc_open_by_lun(char *name, int lun,
int fmcadc_close(struct fmcadc_dev *dev) int fmcadc_close(struct fmcadc_dev *dev)
{ {
struct fmcadc_gid *b = (void *)dev; struct fmcadc_gid *b = (struct fmcadc_gid *)dev;
return b->board->fa_op->close(dev); return b->board->fa_op->close(dev);
} }
lib/config-zio.c
View file @ 415a814e
...@@ -115,7 +115,7 @@ int fmcadc_zio_get_param(struct fmcadc_dev *dev, char *name, ...@@ -115,7 +115,7 @@ int fmcadc_zio_get_param(struct fmcadc_dev *dev, char *name,
static int fa_zio_sysfs_get(struct __fmcadc_dev_zio *fa, char *name, static int fa_zio_sysfs_get(struct __fmcadc_dev_zio *fa, char *name,
uint32_t *resp) uint32_t *resp)
{ {
struct fmcadc_dev *dev = (void *)&fa->gid; /* hack: back and forth.. */ struct fmcadc_dev *dev = (struct fmcadc_dev *)&fa->gid; /* hack: back and forth.. */
int ret; int ret;
int val; int val;
...@@ -139,7 +139,7 @@ static int fa_zio_sysfs_get(struct __fmcadc_dev_zio *fa, char *name, ...@@ -139,7 +139,7 @@ static int fa_zio_sysfs_get(struct __fmcadc_dev_zio *fa, char *name,
int fa_zio_sysfs_set(struct __fmcadc_dev_zio *fa, char *name, int fa_zio_sysfs_set(struct __fmcadc_dev_zio *fa, char *name,
uint32_t *value) uint32_t *value)
{ {
struct fmcadc_dev *dev = (void *)&fa->gid; /* hack: back and forth.. */ struct fmcadc_dev *dev = (struct fmcadc_dev *)&fa->gid; /* hack: back and forth.. */
int ret; int ret;
int val = *value; /* different type */ int val = *value; /* different type */
......
lib/route.c
View file @ 415a814e
...@@ -25,7 +25,7 @@ int fmcadc_acq_start(struct fmcadc_dev *dev, ...@@ -25,7 +25,7 @@ int fmcadc_acq_start(struct fmcadc_dev *dev,
unsigned int flags, unsigned int flags,
struct timeval *timeout) struct timeval *timeout)
{ {
struct fmcadc_gid *g = (void *)dev; struct fmcadc_gid *g = (struct fmcadc_gid *)dev;
const struct fmcadc_board_type *b = g->board; const struct fmcadc_board_type *b = g->board;
return b->fa_op->acq_start(dev, flags, timeout); return b->fa_op->acq_start(dev, flags, timeout);
...@@ -34,7 +34,7 @@ int fmcadc_acq_start(struct fmcadc_dev *dev, ...@@ -34,7 +34,7 @@ int fmcadc_acq_start(struct fmcadc_dev *dev,
int fmcadc_acq_poll(struct fmcadc_dev *dev, unsigned int flags, int fmcadc_acq_poll(struct fmcadc_dev *dev, unsigned int flags,
struct timeval *timeout) struct timeval *timeout)
{ {
struct fmcadc_gid *g = (void *)dev; struct fmcadc_gid *g = (struct fmcadc_gid *)dev;
const struct fmcadc_board_type *b = g->board; const struct fmcadc_board_type *b = g->board;
return b->fa_op->acq_poll(dev, flags, timeout); return b->fa_op->acq_poll(dev, flags, timeout);
...@@ -42,7 +42,7 @@ int fmcadc_acq_poll(struct fmcadc_dev *dev, unsigned int flags, ...@@ -42,7 +42,7 @@ int fmcadc_acq_poll(struct fmcadc_dev *dev, unsigned int flags,
int fmcadc_acq_stop(struct fmcadc_dev *dev, unsigned int flags) int fmcadc_acq_stop(struct fmcadc_dev *dev, unsigned int flags)
{ {
struct fmcadc_gid *g = (void *)dev; struct fmcadc_gid *g = (struct fmcadc_gid *)dev;
const struct fmcadc_board_type *b = g->board; const struct fmcadc_board_type *b = g->board;
return b->fa_op->acq_stop(dev, flags); return b->fa_op->acq_stop(dev, flags);
...@@ -51,7 +51,7 @@ int fmcadc_acq_stop(struct fmcadc_dev *dev, unsigned int flags) ...@@ -51,7 +51,7 @@ int fmcadc_acq_stop(struct fmcadc_dev *dev, unsigned int flags)
int fmcadc_apply_config(struct fmcadc_dev *dev, unsigned int flags, int fmcadc_apply_config(struct fmcadc_dev *dev, unsigned int flags,
struct fmcadc_conf *conf) struct fmcadc_conf *conf)
{ {
struct fmcadc_gid *g = (void *)dev; struct fmcadc_gid *g = (struct fmcadc_gid *)dev;
const struct fmcadc_board_type *b = g->board; const struct fmcadc_board_type *b = g->board;
uint64_t cap_mask; uint64_t cap_mask;
...@@ -70,7 +70,7 @@ int fmcadc_apply_config(struct fmcadc_dev *dev, unsigned int flags, ...@@ -70,7 +70,7 @@ int fmcadc_apply_config(struct fmcadc_dev *dev, unsigned int flags,
int fmcadc_retrieve_config(struct fmcadc_dev *dev, struct fmcadc_conf *conf) int fmcadc_retrieve_config(struct fmcadc_dev *dev, struct fmcadc_conf *conf)
{ {
struct fmcadc_gid *g = (void *)dev; struct fmcadc_gid *g = (struct fmcadc_gid *)dev;
const struct fmcadc_board_type *b = g->board; const struct fmcadc_board_type *b = g->board;
uint64_t cap_mask; uint64_t cap_mask;
...@@ -90,7 +90,7 @@ int fmcadc_retrieve_config(struct fmcadc_dev *dev, struct fmcadc_conf *conf) ...@@ -90,7 +90,7 @@ int fmcadc_retrieve_config(struct fmcadc_dev *dev, struct fmcadc_conf *conf)
int fmcadc_get_param(struct fmcadc_dev *dev, char *name, int fmcadc_get_param(struct fmcadc_dev *dev, char *name,
char *sptr, int *iptr) char *sptr, int *iptr)
{ {
struct fmcadc_gid *g = (void *)dev; struct fmcadc_gid *g = (struct fmcadc_gid *)dev;
const struct fmcadc_board_type *b = g->board; const struct fmcadc_board_type *b = g->board;
return b->fa_op->get_param(dev, name, sptr, iptr); return b->fa_op->get_param(dev, name, sptr, iptr);
...@@ -99,7 +99,7 @@ int fmcadc_get_param(struct fmcadc_dev *dev, char *name, ...@@ -99,7 +99,7 @@ int fmcadc_get_param(struct fmcadc_dev *dev, char *name,
int fmcadc_set_param(struct fmcadc_dev *dev, char *name, int fmcadc_set_param(struct fmcadc_dev *dev, char *name,
char *sptr, int *iptr) char *sptr, int *iptr)
{ {
struct fmcadc_gid *g = (void *)dev; struct fmcadc_gid *g = (struct fmcadc_gid *)dev;
const struct fmcadc_board_type *b = g->board; const struct fmcadc_board_type *b = g->board;
return b->fa_op->set_param(dev, name, sptr, iptr); return b->fa_op->set_param(dev, name, sptr, iptr);
...@@ -110,7 +110,7 @@ struct fmcadc_buffer *fmcadc_request_buffer(struct fmcadc_dev *dev, ...@@ -110,7 +110,7 @@ struct fmcadc_buffer *fmcadc_request_buffer(struct fmcadc_dev *dev,
void *(*alloc)(size_t), void *(*alloc)(size_t),
unsigned int flags) unsigned int flags)
{ {
struct fmcadc_gid *g = (void *)dev; struct fmcadc_gid *g = (struct fmcadc_gid *)dev;
const struct fmcadc_board_type *b = g->board; const struct fmcadc_board_type *b = g->board;
return b->fa_op->request_buffer(dev, nsamples, alloc, flags); return b->fa_op->request_buffer(dev, nsamples, alloc, flags);
...@@ -121,7 +121,7 @@ int fmcadc_fill_buffer(struct fmcadc_dev *dev, ...@@ -121,7 +121,7 @@ int fmcadc_fill_buffer(struct fmcadc_dev *dev,
unsigned int flags, unsigned int flags,
struct timeval *timeout) struct timeval *timeout)
{ {
struct fmcadc_gid *g = (void *)dev; struct fmcadc_gid *g = (struct fmcadc_gid *)dev;
const struct fmcadc_board_type *b = g->board; const struct fmcadc_board_type *b = g->board;
return b->fa_op->fill_buffer(dev, buf, flags, timeout); return b->fa_op->fill_buffer(dev, buf, flags, timeout);
...@@ -130,7 +130,7 @@ int fmcadc_fill_buffer(struct fmcadc_dev *dev, ...@@ -130,7 +130,7 @@ int fmcadc_fill_buffer(struct fmcadc_dev *dev,
struct fmcadc_timestamp *fmcadc_tstamp_buffer(struct fmcadc_buffer *buf, struct fmcadc_timestamp *fmcadc_tstamp_buffer(struct fmcadc_buffer *buf,
struct fmcadc_timestamp *ts) struct fmcadc_timestamp *ts)
{ {
struct fmcadc_gid *g = (void *)buf->dev; struct fmcadc_gid *g = (struct fmcadc_gid *)buf->dev;
const struct fmcadc_board_type *b = g->board; const struct fmcadc_board_type *b = g->board;
return b->fa_op->tstamp_buffer(buf, ts); return b->fa_op->tstamp_buffer(buf, ts);
...@@ -139,7 +139,7 @@ struct fmcadc_timestamp *fmcadc_tstamp_buffer(struct fmcadc_buffer *buf, ...@@ -139,7 +139,7 @@ struct fmcadc_timestamp *fmcadc_tstamp_buffer(struct fmcadc_buffer *buf,
int fmcadc_release_buffer(struct fmcadc_dev *dev, struct fmcadc_buffer *buf, int fmcadc_release_buffer(struct fmcadc_dev *dev, struct fmcadc_buffer *buf,
void (*free)(void *)) void (*free)(void *))
{ {
struct fmcadc_gid *g = (void *)dev; struct fmcadc_gid *g = (struct fmcadc_gid *)dev;
const struct fmcadc_board_type *b = g->board; const struct fmcadc_board_type *b = g->board;
if (!buf) if (!buf)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment