mirrors/libfprint
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/libfprint.git synced 2025-11-15 07:38:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

lib: Replace empty fp_dbg() calls

Browse Source 
GLib won't like them, so use G_DEBUG_HERE() instead.
This commit is contained in:
Bastien Nocera
2018-05-23 18:26:22 +02:00
parent c376c6fb02
commit 363a1b3371
16 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libfprint/drivers/aes1610.c
View File

@@ -701,7 +701,7 @@ static void capture_sm_complete(struct fpi_ssm *ssm)
struct fp_img_dev *dev = ssm->priv;
struct aes1610_dev *aesdev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
if (aesdev->deactivating)
complete_deactivation(dev);
else if (ssm->error)
@@ -722,7 +722,7 @@ static void start_capture(struct fp_img_dev *dev)
}
ssm = fpi_ssm_new(dev->dev, capture_run_state, CAPTURE_NUM_STATES);
fp_dbg("");
G_DEBUG_HERE();
ssm->priv = dev;
fpi_ssm_start(ssm, capture_sm_complete);
}
@@ -791,7 +791,7 @@ static void dev_deactivate(struct fp_img_dev *dev)
static void complete_deactivation(struct fp_img_dev *dev)
{
struct aes1610_dev *aesdev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
/* FIXME: if we're in the middle of a scan, we should cancel the scan.
* maybe we can do this with a master reset, unconditionally? */

10
libfprint/drivers/aes2501.c
View File

@@ -155,7 +155,7 @@ static void read_regs(struct fp_img_dev *dev, aes2501_read_regs_cb callback,
struct aes_regwrite *regwrite = g_malloc(sizeof(*regwrite));
struct aes2501_read_regs *rdata = g_malloc(sizeof(*rdata));
fp_dbg("");
G_DEBUG_HERE();
regwrite->reg = AES2501_REG_CTRL2;
regwrite->value = AES2501_CTRL2_READ_REGS;
rdata->dev = dev;
@@ -354,7 +354,7 @@ static void finger_det_reqs_cb(struct fp_img_dev *dev, int result,
static void start_finger_detection(struct fp_img_dev *dev)
{
struct aes2501_dev *aesdev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
if (aesdev->deactivating) {
complete_deactivation(dev);
@@ -583,7 +583,7 @@ static void capture_sm_complete(struct fpi_ssm *ssm)
struct fp_img_dev *dev = ssm->priv;
struct aes2501_dev *aesdev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
if (aesdev->deactivating)
complete_deactivation(dev);
else if (ssm->error)
@@ -607,7 +607,7 @@ static void start_capture(struct fp_img_dev *dev)
/* Reset gain */
strip_scan_reqs[4].value = AES2501_ADREFHI_MAX_VALUE;
ssm = fpi_ssm_new(dev->dev, capture_run_state, CAPTURE_NUM_STATES);
fp_dbg("");
G_DEBUG_HERE();
ssm->priv = dev;
fpi_ssm_start(ssm, capture_sm_complete);
}
@@ -831,7 +831,7 @@ static void dev_deactivate(struct fp_img_dev *dev)
static void complete_deactivation(struct fp_img_dev *dev)
{
struct aes2501_dev *aesdev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
/* FIXME: if we're in the middle of a scan, we should cancel the scan.
* maybe we can do this with a master reset, unconditionally? */

6
libfprint/drivers/aes2550.c
View File

@@ -159,7 +159,7 @@ static void start_finger_detection(struct fp_img_dev *dev)
int r;
struct aes2550_dev *aesdev = dev->priv;
struct libusb_transfer *transfer;
fp_dbg("");
G_DEBUG_HERE();
if (aesdev->deactivating) {
complete_deactivation(dev);
@@ -421,7 +421,7 @@ static void start_capture(struct fp_img_dev *dev)
aesdev->heartbeat_cnt = 0;
ssm = fpi_ssm_new(dev->dev, capture_run_state, CAPTURE_NUM_STATES);
fp_dbg("");
G_DEBUG_HERE();
ssm->priv = dev;
fpi_ssm_start(ssm, capture_sm_complete);
}
@@ -606,7 +606,7 @@ static void dev_deactivate(struct fp_img_dev *dev)
static void complete_deactivation(struct fp_img_dev *dev)
{
struct aes2550_dev *aesdev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
aesdev->deactivating = FALSE;
g_slist_free(aesdev->strips);

4
libfprint/drivers/aesx660.c
View File

@@ -437,7 +437,7 @@ static void start_capture(struct fp_img_dev *dev)
}
ssm = fpi_ssm_new(dev->dev, capture_run_state, CAPTURE_NUM_STATES);
fp_dbg("");
G_DEBUG_HERE();
ssm->priv = dev;
fpi_ssm_start(ssm, capture_sm_complete);
}
@@ -623,7 +623,7 @@ void aesX660_dev_deactivate(struct fp_img_dev *dev)
static void complete_deactivation(struct fp_img_dev *dev)
{
struct aesX660_dev *aesdev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
aesdev->deactivating = FALSE;
g_slist_free(aesdev->strips);

38
libfprint/drivers/elan.c
View File

@@ -62,7 +62,7 @@ struct elan_dev {
static void elan_dev_reset(struct elan_dev *elandev)
{
fp_dbg("");
G_DEBUG_HERE();
BUG_ON(elandev->cur_transfer);
@@ -88,7 +88,7 @@ static void elan_save_frame(struct fp_img_dev *dev)
unsigned short *frame =
g_malloc(elandev->frame_width * elandev->frame_height * 2);
fp_dbg("");
G_DEBUG_HERE();
/* Raw images are vertical and perpendicular to swipe direction of a
* normalized image, which means we need to make them horizontal before
@@ -116,7 +116,7 @@ static void elan_process_frame(unsigned short *raw_frame, GSList ** frames)
struct fpi_frame *frame =
g_malloc(frame_size + sizeof(struct fpi_frame));
fp_dbg("");
G_DEBUG_HERE();
unsigned short min = 0xffff, max = 0;
for (int i = 0; i < frame_size; i++) {
@@ -147,7 +147,7 @@ static void elan_submit_image(struct fp_img_dev *dev)
GSList *frames = NULL;
struct fp_img *img;
fp_dbg("");
G_DEBUG_HERE();
for (int i = 0; i < ELAN_SKIP_LAST_FRAMES; i++)
elandev->frames = g_slist_next(elandev->frames);
@@ -170,7 +170,7 @@ static void elan_cmd_done(struct fpi_ssm *ssm)
struct fp_img_dev *dev = ssm->priv;
struct elan_dev *elandev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
elandev->cmd_idx += 1;
if (elandev->cmd_idx < elandev->cmds_len)
@@ -185,7 +185,7 @@ static void elan_cmd_cb(struct libusb_transfer *transfer)
struct fp_img_dev *dev = ssm->priv;
struct elan_dev *elandev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
elandev->cur_transfer = NULL;
@@ -228,7 +228,7 @@ static void elan_cmd_read(struct fpi_ssm *ssm)
struct elan_dev *elandev = dev->priv;
int response_len = elandev->cmds[elandev->cmd_idx].response_len;
fp_dbg("");
G_DEBUG_HERE();
if (elandev->cmds[elandev->cmd_idx].cmd == read_cmds[0].cmd)
/* raw data has 2-byte "pixels" and the frame is vertical */
@@ -260,7 +260,7 @@ static void elan_run_next_cmd(struct fpi_ssm *ssm)
struct fp_img_dev *dev = ssm->priv;
struct elan_dev *elandev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
struct libusb_transfer *transfer = libusb_alloc_transfer(0);
if (!transfer) {
@@ -287,7 +287,7 @@ static void elan_run_cmds(struct fpi_ssm *ssm, const struct elan_cmd *cmds,
struct fp_img_dev *dev = ssm->priv;
struct elan_dev *elandev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
elandev->cmds = cmds;
elandev->cmds_len = cmds_len;
@@ -323,7 +323,7 @@ static void elan_deactivate(struct fp_img_dev *dev)
{
struct elan_dev *elandev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
elan_dev_reset(elandev);
@@ -386,7 +386,7 @@ static void capture_complete(struct fpi_ssm *ssm)
struct fp_img_dev *dev = ssm->priv;
struct elan_dev *elandev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
if (elandev->deactivating)
elan_deactivate(dev);
@@ -423,7 +423,7 @@ static void elan_capture(struct fp_img_dev *dev)
{
struct elan_dev *elandev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
elan_dev_reset(elandev);
struct fpi_ssm *ssm =
@@ -466,7 +466,7 @@ static void calibrate_complete(struct fpi_ssm *ssm)
struct fp_img_dev *dev = ssm->priv;
struct elan_dev *elandev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
if (elandev->deactivating)
elan_deactivate(dev);
@@ -483,7 +483,7 @@ static void elan_calibrate(struct fp_img_dev *dev)
{
struct elan_dev *elandev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
elan_dev_reset(elandev);
struct fpi_ssm *ssm = fpi_ssm_new(dev->dev, elan_calibrate_run_state,
@@ -536,7 +536,7 @@ static void activate_complete(struct fpi_ssm *ssm)
struct fp_img_dev *dev = ssm->priv;
struct elan_dev *elandev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
if (elandev->deactivating)
elan_deactivate(dev);
@@ -551,7 +551,7 @@ static int dev_activate(struct fp_img_dev *dev, enum fp_imgdev_state state)
{
struct elan_dev *elandev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
elan_dev_reset(elandev);
struct fpi_ssm *ssm =
@@ -567,7 +567,7 @@ static int dev_init(struct fp_img_dev *dev, unsigned long driver_data)
struct elan_dev *elandev;
int r;
fp_dbg("");
G_DEBUG_HERE();
r = libusb_claim_interface(dev->udev, 0);
if (r < 0) {
@@ -584,7 +584,7 @@ static void dev_deinit(struct fp_img_dev *dev)
{
struct elan_dev *elandev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
elan_dev_reset(elandev);
g_free(elandev);
@@ -596,7 +596,7 @@ static void dev_deactivate(struct fp_img_dev *dev)
{
struct elan_dev *elandev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
elandev->deactivating = TRUE;

4
libfprint/drivers/upeksonly.c
View File

@@ -730,7 +730,7 @@ static void sm_await_intr(struct fpi_ssm *ssm)
return;
}
fp_dbg("");
G_DEBUG_HERE();
data = g_malloc(4);
libusb_fill_interrupt_transfer(transfer, dev->udev, 0x83, data, 4,
sm_await_intr_cb, ssm, 0);
@@ -1224,7 +1224,7 @@ static void deactivate_done(struct fp_img_dev *dev)
{
struct sonly_dev *sdev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
free_img_transfers(sdev);
g_free(sdev->rowbuf);
sdev->rowbuf = NULL;

6
libfprint/drivers/upektc.c
View File

@@ -256,7 +256,7 @@ static void start_finger_detection(struct fp_img_dev *dev)
int r;
struct upektc_dev *upekdev = dev->priv;
struct libusb_transfer *transfer;
fp_dbg("");
G_DEBUG_HERE();
if (upekdev->deactivating) {
complete_deactivation(dev);
@@ -401,7 +401,7 @@ static void start_capture(struct fp_img_dev *dev)
}
ssm = fpi_ssm_new(dev->dev, capture_run_state, CAPTURE_NUM_STATES);
fp_dbg("");
G_DEBUG_HERE();
ssm->priv = dev;
fpi_ssm_start(ssm, capture_sm_complete);
}
@@ -427,7 +427,7 @@ static void dev_deactivate(struct fp_img_dev *dev)
static void complete_deactivation(struct fp_img_dev *dev)
{
struct upektc_dev *upekdev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
upekdev->deactivating = FALSE;
fpi_imgdev_deactivate_complete(dev);

2
libfprint/drivers/uru4000.c
View File

@@ -366,7 +366,7 @@ static void sm_do_challenge_response(struct fpi_ssm *ssm)
struct fp_img_dev *dev = ssm->priv;
int r;
fp_dbg("");
G_DEBUG_HERE();
r = read_regs(dev, REG_CHALLENGE, CR_LENGTH, challenge_cb, ssm);
if (r < 0)
fpi_ssm_mark_aborted(ssm, r);

2
libfprint/drivers/vcom5s.c
View File

@@ -256,7 +256,7 @@ static void sm_do_capture(struct fpi_ssm *ssm)
struct fp_img_dev *dev = ssm->priv;
struct v5s_dev *vdev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
vdev->capture_img = fpi_img_new_for_imgdev(dev);
vdev->capture_iteration = 0;
capture_iterate(ssm);

6
libfprint/drivers/vfs101.c
View File

@@ -589,7 +589,7 @@ static void vfs_abort_print(struct fpi_ssm *ssm)
{
unsigned char data[0x06] = { 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00 };
fp_dbg("");
G_DEBUG_HERE();
/* Run swap sequential state machine */
m_swap (ssm, data, 0x06);
@@ -622,7 +622,7 @@ static void vfs_get_finger_state(struct fpi_ssm *ssm)
{
unsigned char data[0x06] = { 0x00, 0x00, 0x00, 0x00, 0x16, 0x00 };
fp_dbg("");
G_DEBUG_HERE();
/* Run swap sequential state machine */
m_swap (ssm, data, 0x06);
@@ -634,7 +634,7 @@ static void vfs_img_load(struct fpi_ssm *ssm)
struct fp_img_dev *dev = ssm->priv;
struct vfs101_dev *vdev = dev->priv;
fp_dbg("");
G_DEBUG_HERE();
/* Reset buffer length */
vdev->length = 0;