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

asix-sigma: Remove NUM_CHANNELS macro 

The NUM_CHANNELS macro is inflexible, since in 100MHz and 200MHz modes
we don't support 16 channels. Moreover, it's only used to limit the size
of array of channel labels, which can be done in much cleaner way.

Signed-off-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Marek Vasut 2014-04-20 17:02:05 +02:00 committed by Bert Vermeulen
parent b1648dea88
commit 790c7ccc88
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,6 @@
#define USB_VENDOR_NAME "ASIX" #define USB_VENDOR_NAME "ASIX"
#define USB_MODEL_NAME "SIGMA" #define USB_MODEL_NAME "SIGMA"
#define TRIGGER_TYPE "rf10" #define TRIGGER_TYPE "rf10"
#define NUM_CHANNELS 16
SR_PRIV struct sr_dev_driver asix_sigma_driver_info; SR_PRIV struct sr_dev_driver asix_sigma_driver_info;
static struct sr_dev_driver *di = &asix_sigma_driver_info; static struct sr_dev_driver *di = &asix_sigma_driver_info;
@ -67,10 +66,9 @@ static const uint64_t samplerates[] = {
* http://tools.asix.net/img/sigma_sigmacab_pins_720.jpg * http://tools.asix.net/img/sigma_sigmacab_pins_720.jpg
* (the cable has two additional GND pins, and a TI and TO pin) * (the cable has two additional GND pins, and a TI and TO pin)
*/ */
static const char *channel_names[NUM_CHANNELS + 1] = { static const char *channel_names[] = {
"1", "2", "3", "4", "5", "6", "7", "8", "1", "2", "3", "4", "5", "6", "7", "8",
"9", "10", "11", "12", "13", "14", "15", "16", "9", "10", "11", "12", "13", "14", "15", "16",
NULL,
}; };
static const int32_t hwcaps[] = { static const int32_t hwcaps[] = {
@ -416,7 +414,8 @@ static GSList *scan(GSList *options)
struct ftdi_device_list *devlist; struct ftdi_device_list *devlist;
char serial_txt[10]; char serial_txt[10];
uint32_t serial; uint32_t serial;
int ret, i; int ret;
unsigned int i;
(void)options; (void)options;
@ -470,9 +469,10 @@ static GSList *scan(GSList *options)
} }
sdi->driver = di; sdi->driver = di;
for (i = 0; channel_names[i]; i++) { for (i = 0; i < ARRAY_SIZE(channel_names); i++) {
if (!(ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE,
channel_names[i]))) channel_names[i]);
if (!ch)
return NULL; return NULL;
sdi->channels = g_slist_append(sdi->channels, ch); sdi->channels = g_slist_append(sdi->channels, ch);
} }