depau/libfprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use G_N_ELEMENTS macro

Browse source
This commit is contained in:
Daniel Drake 2007-11-17 23:47:06 +00:00
parent af945b2738
commit fa742a2142
4 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libfprint/core.c
View file

@ -343,10 +343,10 @@ static void register_drivers(void)
{ {
unsigned int i; unsigned int i;
for (i = 0; i < ARRAY_SIZE(primitive_drivers); i++) for (i = 0; i < G_N_ELEMENTS(primitive_drivers); i++)
register_driver(primitive_drivers[i]); register_driver(primitive_drivers[i]);
for (i = 0; i < ARRAY_SIZE(img_drivers); i++) { for (i = 0; i < G_N_ELEMENTS(img_drivers); i++) {
struct fp_img_driver *imgdriver = img_drivers[i]; struct fp_img_driver *imgdriver = img_drivers[i];
fpi_img_driver_setup(imgdriver); fpi_img_driver_setup(imgdriver);
register_driver(&imgdriver->driver); register_driver(&imgdriver->driver);

18
libfprint/drivers/aes2501.c
View file

@ -248,7 +248,7 @@ static int do_init(struct fp_img_dev *dev)
int i; int i;
/* part 1, probably not needed */ /* part 1, probably not needed */
r = write_regv(dev, init_1, ARRAY_SIZE(init_1)); r = write_regv(dev, init_1, G_N_ELEMENTS(init_1));
if (r < 0) if (r < 0)
return r; return r;
@ -257,7 +257,7 @@ static int do_init(struct fp_img_dev *dev)
return r; return r;
/* part 2 */ /* part 2 */
r = write_regv(dev, init_2, ARRAY_SIZE(init_2)); r = write_regv(dev, init_2, G_N_ELEMENTS(init_2));
if (r < 0) if (r < 0)
return r; return r;
@ -269,7 +269,7 @@ static int do_init(struct fp_img_dev *dev)
fp_dbg("reg 0xaf = %x", buffer[0x5f]); fp_dbg("reg 0xaf = %x", buffer[0x5f]);
i = 0; i = 0;
while (buffer[0x5f] == 0x6b) { while (buffer[0x5f] == 0x6b) {
r = write_regv(dev, init_3, ARRAY_SIZE(init_3)); r = write_regv(dev, init_3, G_N_ELEMENTS(init_3));
if (r < 0) if (r < 0)
return r; return r;
r = read_regs(dev, buffer); r = read_regs(dev, buffer);
@ -280,12 +280,12 @@ static int do_init(struct fp_img_dev *dev)
} }
/* part 4 */ /* part 4 */
r = write_regv(dev, init_4, ARRAY_SIZE(init_4)); r = write_regv(dev, init_4, G_N_ELEMENTS(init_4));
if (r < 0) if (r < 0)
return r; return r;
/* part 5 */ /* part 5 */
return write_regv(dev, init_5, ARRAY_SIZE(init_5)); return write_regv(dev, init_5, G_N_ELEMENTS(init_5));
} }
static int dev_init(struct fp_img_dev *dev, unsigned long driver_data) static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
@ -343,7 +343,7 @@ static int detect_finger(struct fp_img_dev *dev)
int i; int i;
int sum = 0; int sum = 0;
r = write_regv(dev, finger_det_reqs, ARRAY_SIZE(finger_det_reqs)); r = write_regv(dev, finger_det_reqs, G_N_ELEMENTS(finger_det_reqs));
if (r < 0) if (r < 0)
return r; return r;
@ -558,7 +558,7 @@ static int capture(struct fp_img_dev *dev, gboolean unconditional,
/* FIXME can do better here in terms of buffer management? */ /* FIXME can do better here in terms of buffer management? */
fp_dbg(""); fp_dbg("");
r = write_regv(dev, capture_reqs_1, ARRAY_SIZE(capture_reqs_1)); r = write_regv(dev, capture_reqs_1, G_N_ELEMENTS(capture_reqs_1));
if (r < 0) if (r < 0)
return r; return r;
@ -566,7 +566,7 @@ static int capture(struct fp_img_dev *dev, gboolean unconditional,
if (r < 0) if (r < 0)
return r; return r;
r = write_regv(dev, capture_reqs_2, ARRAY_SIZE(capture_reqs_2)); r = write_regv(dev, capture_reqs_2, G_N_ELEMENTS(capture_reqs_2));
if (r < 0) if (r < 0)
return r; return r;
@ -583,7 +583,7 @@ static int capture(struct fp_img_dev *dev, gboolean unconditional,
for (nstrips = 0; nstrips < MAX_FRAMES; nstrips++) { for (nstrips = 0; nstrips < MAX_FRAMES; nstrips++) {
int threshold; int threshold;
r = write_regv(dev, strip_scan_reqs, ARRAY_SIZE(strip_scan_reqs)); r = write_regv(dev, strip_scan_reqs, G_N_ELEMENTS(strip_scan_reqs));
if (r < 0) if (r < 0)
goto err; goto err;
r = read_data(dev, buf, 1705); r = read_data(dev, buf, 1705);

2
libfprint/drivers/aes4000.c
View file

@ -142,7 +142,7 @@ static int capture(struct fp_img_dev *dev, gboolean unconditional,
unsigned char *data; unsigned char *data;
unsigned char *ptr; unsigned char *ptr;
for (i = 0; i < ARRAY_SIZE(init_reqs); i++) { for (i = 0; i < G_N_ELEMENTS(init_reqs); i++) {
r = write_reg(dev, init_reqs[i].reg, init_reqs[i].value); r = write_reg(dev, init_reqs[i].reg, init_reqs[i].value);
if (r < 0) if (r < 0)
return r; return r;

2
libfprint/fp_internal.h
View file

@ -28,8 +28,6 @@
#include <fprint.h> #include <fprint.h>
#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*a))
#define container_of(ptr, type, member) ({ \ #define container_of(ptr, type, member) ({ \
const typeof( ((type *)0)->member ) *__mptr = (ptr); \ const typeof( ((type *)0)->member ) *__mptr = (ptr); \
(type *)( (char *)__mptr - offsetof(type,member) );}) (type *)( (char *)__mptr - offsetof(type,member) );})