upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

dev/usb: use our nitems() macro when param.h is available.

Browse source 
Reviewed by: hselasky
This commit is contained in:
Pedro F. Giffuni 2016-04-19 22:07:36 +00:00
parent 3db33b0a8c
commit 432157dc67
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/dev/usb/input/ukbd.c
View file

@ -2087,7 +2087,7 @@ ukbd_key2scan(struct ukbd_softc *sc, int code, int shift, int up)
0x72, /* Apple Keyboard JIS (Eisu) */
};
if ((code >= 89) && (code < (int)(89 + (sizeof(scan) / sizeof(scan[0]))))) {
if ((code >= 89) && (code < (int)(89 + nitems(scan)))) {
code = scan[code - 89];
}
/* Pause/Break */

2
sys/dev/usb/serial/u3g.c
View file

@ -670,7 +670,7 @@ u3g_sael_m460_init(struct usb_device *udev)
return;
}
for (n = 0; n != (sizeof(setup)/sizeof(setup[0])); n++) {
for (n = 0; n != nitems(setup); n++) {
memcpy(&req, setup[n], sizeof(req));

2
sys/dev/usb/serial/uchcom.c
View file

@ -195,7 +195,7 @@ static const struct uchcom_divider_record dividers[] =
{367, 1, 11719, {0, 0, 0}},
};
#define NUM_DIVIDERS (sizeof (dividers) / sizeof (dividers[0]))
#define NUM_DIVIDERS nitems(dividers)
static const STRUCT_USB_HOST_ID uchcom_devs[] = {
{USB_VPI(USB_VENDOR_WCH, USB_PRODUCT_WCH_CH341SER, 0)},

2
sys/dev/usb/serial/umcs.c
View file

@ -1072,7 +1072,7 @@ umcs7840_set_baudrate(struct umcs7840_softc *sc, uint8_t portno, uint32_t rate)
/* Maximum speeds for standard frequences, when PLL is not used */
static const uint32_t umcs7840_baudrate_divisors[] = {0, 115200, 230400, 403200, 460800, 806400, 921600, 1572864, 3145728,};
static const uint8_t umcs7840_baudrate_divisors_len = sizeof(umcs7840_baudrate_divisors) / sizeof(umcs7840_baudrate_divisors[0]);
static const uint8_t umcs7840_baudrate_divisors_len = nitems(umcs7840_baudrate_divisors);
static usb_error_t
umcs7840_calc_baudrate(uint32_t rate, uint16_t *divisor, uint8_t *clk)

2
sys/dev/usb/serial/uplcom.c
View file

@ -642,7 +642,7 @@ static const uint32_t uplcom_rates[] = {
230400, 460800, 614400, 921600, 1228800
};
#define N_UPLCOM_RATES (sizeof(uplcom_rates)/sizeof(uplcom_rates[0]))
#define N_UPLCOM_RATES nitems(uplcom_rates)
static int
uplcom_pre_param(struct ucom_softc *ucom, struct termios *t)