Skip to content

Z
ZIO
Commit f0716f34 authored by Federico Vaga's avatar Federico Vaga Committed by Alessandro Rubini
Browse files
Options

(incompatible) rename: cset and chan flags 

Signed-off-by: 's avatarFederico Vaga <federico.vaga@gmail.com>
Acked-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent 6179e5e9
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 26 deletions
doc/zio-manual.in
View file @ f0716f34
......@@ -928,13 +928,13 @@ or used by the developer are:
significant bits, but they are expected to share the sample
size in the data blocks.
@cindex ZCSET_TYPE_DIGITAL
@cindex ZCSET_TYPE_ANALOG
@cindex ZCSET_TYPE_TIME
@cindex ZIO_CSET_TYPE_DIGITAL
@cindex ZIO_CSET_TYPE_ANALOG
@cindex ZIO_CSET_TYPE_TIME
@item unsigned long flags
Currently only the type: @code{ZCSET_TYPE_DIGITAL},
@code{ZCSET_TYPE_ANALOG} or @code{ZCSET_TYPE_TIME} (other types
Currently only the type: @code{ZIO_CSET_TYPE_DIGITAL},
@code{ZIO_CSET_TYPE_ANALOG} or @code{ZIO_CSET_TYPE_TIME} (other types
may be added in the future, we reserved for 8 of them).
The flag has only informative value.
......
drivers/zio-ad788x.c
View file @ f0716f34
......@@ -197,7 +197,7 @@ static struct zio_cset ad7887_ain_cset[] = { /* ad7887 cset */
.raw_io = ad788x_input_cset,
.ssize = 2,
.n_chan = 2,
.flags = ZCSET_TYPE_ANALOG | /* is analog */
.flags = ZIO_CSET_TYPE_ANALOG | /* is analog */
ZIO_DIR_INPUT /* is input */,
},
};
......@@ -206,7 +206,7 @@ static struct zio_cset ad7888_ain_cset[] = { /* ad7888 cset */
.raw_io = ad788x_input_cset,
.ssize = 2,
.n_chan = 8,
.flags = ZCSET_TYPE_ANALOG | /* is analog */
.flags = ZIO_CSET_TYPE_ANALOG | /* is analog */
ZIO_DIR_INPUT /* is input */,
},
};
......
drivers/zio-gpio.c
View file @ f0716f34
......@@ -92,13 +92,13 @@ static struct zio_cset zgp_cset[] = {
.raw_io = zgp_output,
.n_chan = 1,
.ssize = 1,
.flags = ZIO_DIR_OUTPUT | ZCSET_TYPE_ANALOG,
.flags = ZIO_DIR_OUTPUT | ZIO_CSET_TYPE_ANALOG,
},
{
.raw_io = zgp_input,
.n_chan = 1,
.ssize = 1,
.flags = ZIO_DIR_INPUT | ZCSET_TYPE_ANALOG,
.flags = ZIO_DIR_INPUT | ZIO_CSET_TYPE_ANALOG,
},
};
static struct zio_device zgp_tmpl = {
......
drivers/zio-zero.c
View file @ f0716f34
......@@ -118,7 +118,7 @@ static struct zio_cset zzero_cset[] = {
.raw_io = zzero_input_8,
.n_chan = 3,
.ssize = 1,
.flags = ZIO_DIR_INPUT | ZCSET_TYPE_ANALOG,
.flags = ZIO_DIR_INPUT | ZIO_CSET_TYPE_ANALOG,
.zattr_set = {
.std_zattr = zzero_zattr_cset8,
},
......@@ -128,7 +128,7 @@ static struct zio_cset zzero_cset[] = {
.raw_io = zzero_output,
.n_chan = 1,
.ssize = 1,
.flags = ZIO_DIR_OUTPUT | ZCSET_TYPE_ANALOG,
.flags = ZIO_DIR_OUTPUT | ZIO_CSET_TYPE_ANALOG,
.zattr_set = {
.std_zattr = zzero_zattr_cset8,
},
......@@ -138,7 +138,7 @@ static struct zio_cset zzero_cset[] = {
.raw_io = zzero_input_32,
.n_chan = 1,
.ssize = 4,
.flags = ZIO_DIR_INPUT | ZCSET_TYPE_ANALOG,
.flags = ZIO_DIR_INPUT | ZIO_CSET_TYPE_ANALOG,
.zattr_set = {
.std_zattr = zzero_zattr_cset32,
.ext_zattr = zzero_cset1_ext,
......
include/linux/zio.h
View file @ f0716f34
......@@ -112,7 +112,7 @@ static inline enum zio_object_type zio_get_object_type(struct device *dev)
}
/* Bits 0..3 are reserved for use in all objects. By now only bit 1 is used */
enum zobj_flags {
enum zio_obj_flags {
ZIO_STATUS = 0x1, /* 0 (default) is enabled */
ZIO_ENABLED = 0x0,
ZIO_DISABLED = 0x1,
......@@ -204,12 +204,12 @@ struct zio_cset {
};
/* first 4bit are reserved for zio object universal flags */
enum zcset_flags {
ZCSET_TYPE = 0x70, /* digital, analog, time, TBD... */
ZCSET_TYPE_DIGITAL = 0x00,
ZCSET_TYPE_ANALOG = 0x10,
ZCSET_TYPE_TIME = 0x20,
ZCSET_CHAN_TEMPLATE = 0x80, /* 1 if channels from template */
enum zio_cset_flags {
ZIO_CSET_TYPE = 0x70, /* digital, analog, time, TBD... */
ZIO_CSET_TYPE_DIGITAL = 0x00,
ZIO_CSET_TYPE_ANALOG = 0x10,
ZIO_CSET_TYPE_TIME = 0x20,
ZIO_CSET_CHAN_TEMPLATE = 0x80, /* 1 if channels from template */
};
......@@ -238,10 +238,10 @@ struct zio_channel {
};
/* first 4bit are reserved for zio object universal flags */
enum zchan_flag_mask {
ZCHAN_POLAR = 0x10, /* 0 is positive - 1 is negative*/
ZCHAN_POLAR_POSITIVE = 0x00,
ZCHAN_POLAR_NEGATIVE = 0x10,
enum zio_chan_flags {
ZIO_CHAN_POLAR = 0x10, /* 0 is positive - 1 is negative*/
ZIO_CHAN_POLAR_POSITIVE = 0x00,
ZIO_CHAN_POLAR_NEGATIVE = 0x10,
};
/* get each channel from cset */
......
zio-sys.c
View file @ f0716f34
......@@ -1668,7 +1668,7 @@ static int chan_register(struct zio_channel *chan, struct zio_channel *chan_t)
chan->head.zobj_type = ZCHAN;
/* Copy from template, initialize and verify zio attributes */
if (chan_t) { /* ZCSET_CHAN_TEMPLATE is set */
if (chan_t) { /* ZIO_CSET_CHAN_TEMPLATE is set */
chan->flags |= chan_t->flags;
if (chan_t->zattr_set.std_zattr)
chan_t->zattr_set.n_std_attr = ZATTR_STD_NUM_ZDEV;
......@@ -1766,7 +1766,7 @@ static void chan_unregister(struct zio_channel *chan)
device_unregister(&chan->head.dev);
zio_free_control(chan->current_ctrl);
zattr_set_remove(&chan->head);
if (chan->cset->flags & ZCSET_CHAN_TEMPLATE)
if (chan->cset->flags & ZIO_CSET_CHAN_TEMPLATE)
__zattr_set_free(&chan->zattr_set);
}
......@@ -1903,7 +1903,7 @@ static int cset_register(struct zio_cset *cset, struct zio_cset *cset_t)
if (!cset->chan)
goto out_n_chan;
if (cset->chan_template || cset_t->chan)
cset->flags |= ZCSET_CHAN_TEMPLATE;
cset->flags |= ZIO_CSET_CHAN_TEMPLATE;
/* Register all child channels */
for (i = 0; i < cset->n_chan; i++) {
......
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