mirror of
https://gitlab.freedesktop.org/libfprint/libfprint.git
synced 2026-03-26 23:00:39 +01:00
Fixed indent etc. via uncrustify
This commit is contained in:
Sprayxe
parent
034e7e9bee
commit
eb0bfbdd31
2 changed files with 308 additions and 288 deletions
|
|
@ -24,8 +24,7 @@
|
|||
#include "drivers_api.h"
|
||||
|
||||
/* Sequence types */
|
||||
typedef enum
|
||||
{
|
||||
typedef enum {
|
||||
SEQ_INIT,
|
||||
SEQ_REPEAT,
|
||||
SEQ_POLL,
|
||||
|
|
@ -33,8 +32,7 @@ typedef enum
|
|||
} seq_types;
|
||||
|
||||
/* SSM States */
|
||||
enum sm_states
|
||||
{
|
||||
enum sm_states {
|
||||
DEV_OPEN,
|
||||
DEV_START,
|
||||
DEV_REQ,
|
||||
|
|
@ -48,18 +46,18 @@ struct _FpDeviceEgis0576
|
|||
{
|
||||
FpImageDevice parent;
|
||||
|
||||
gboolean running;
|
||||
gboolean stop;
|
||||
gboolean running;
|
||||
gboolean stop;
|
||||
|
||||
gboolean has_background;
|
||||
guchar background[EGIS0576_IMG_SIZE];
|
||||
gboolean has_background;
|
||||
guchar background[EGIS0576_IMG_SIZE];
|
||||
|
||||
seq_types seq_type;
|
||||
int seq_pkt_index;
|
||||
Egis0576Pkt last_sent_pkt;
|
||||
seq_types seq_type;
|
||||
int seq_pkt_index;
|
||||
Egis0576Pkt last_sent_pkt;
|
||||
};
|
||||
G_DECLARE_FINAL_TYPE(FpDeviceEgis0576, fpi_device_egis0576, FPI, DEVICE_EGIS0576, FpImageDevice);
|
||||
G_DEFINE_TYPE(FpDeviceEgis0576, fpi_device_egis0576, FP_TYPE_IMAGE_DEVICE);
|
||||
G_DECLARE_FINAL_TYPE (FpDeviceEgis0576, fpi_device_egis0576, FPI, DEVICE_EGIS0576, FpImageDevice);
|
||||
G_DEFINE_TYPE (FpDeviceEgis0576, fpi_device_egis0576, FP_TYPE_IMAGE_DEVICE);
|
||||
|
||||
/*
|
||||
* ========================
|
||||
|
|
@ -68,20 +66,22 @@ G_DEFINE_TYPE(FpDeviceEgis0576, fpi_device_egis0576, FP_TYPE_IMAGE_DEVICE);
|
|||
*/
|
||||
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
|
||||
|
||||
static void normalize_img(guchar *bg, guchar *img, double *dark_portion)
|
||||
static void
|
||||
normalize_img (guchar *bg, guchar *img, double *dark_portion)
|
||||
{
|
||||
// Find diffs, min and max
|
||||
int diff[EGIS0576_IMG_SIZE];
|
||||
int min = 255;
|
||||
int max = 0;
|
||||
|
||||
for (int i = 0; i < EGIS0576_IMG_SIZE; i++)
|
||||
{
|
||||
diff[i] = (int)bg[i] - (int)img[i];
|
||||
if (diff[i] < min)
|
||||
min = diff[i];
|
||||
if (diff[i] > max)
|
||||
max = diff[i];
|
||||
}
|
||||
{
|
||||
diff[i] = (int) bg[i] - (int) img[i];
|
||||
if (diff[i] < min)
|
||||
min = diff[i];
|
||||
if (diff[i] > max)
|
||||
max = diff[i];
|
||||
}
|
||||
|
||||
max -= EGIS0576_CONTRAST;
|
||||
min += EGIS0576_CONTRAST;
|
||||
|
|
@ -92,24 +92,25 @@ static void normalize_img(guchar *bg, guchar *img, double *dark_portion)
|
|||
// Adjust contrast / normalize
|
||||
int count_ridges = 0;
|
||||
for (int i = 0; i < EGIS0576_IMG_SIZE; i++)
|
||||
{
|
||||
int normalized = ((diff[i] - min) * 255) / range;
|
||||
{
|
||||
int normalized = ((diff[i] - min) * 255) / range;
|
||||
|
||||
if (normalized < 0)
|
||||
normalized = 0;
|
||||
else if (normalized > 255)
|
||||
normalized = 255;
|
||||
if (normalized < 0)
|
||||
normalized = 0;
|
||||
else if (normalized > 255)
|
||||
normalized = 255;
|
||||
|
||||
img[i] = (unsigned char)normalized;
|
||||
if (img[i] < 170)
|
||||
count_ridges++;
|
||||
}
|
||||
img[i] = (unsigned char) normalized;
|
||||
if (img[i] < 170)
|
||||
count_ridges++;
|
||||
}
|
||||
|
||||
*dark_portion = (double)count_ridges / EGIS0576_IMG_SIZE;
|
||||
*dark_portion = (double) count_ridges / EGIS0576_IMG_SIZE;
|
||||
}
|
||||
|
||||
/* Uses bilinear interpolation */
|
||||
static void upscale_img(guchar *src_img, guchar *dst_img)
|
||||
static void
|
||||
upscale_img (guchar *src_img, guchar *dst_img)
|
||||
{
|
||||
const int scale = EGIS0576_IMG_UPSCALE;
|
||||
const int src_w = EGIS0576_IMG_WIDTH;
|
||||
|
|
@ -118,34 +119,35 @@ static void upscale_img(guchar *src_img, guchar *dst_img)
|
|||
const int dst_h = EGIS0576_IMG_HEIGHT_UPSCALE;
|
||||
|
||||
for (int y = 0; y < dst_h; y++)
|
||||
{
|
||||
float gy = ((float)y) / scale;
|
||||
int y1 = (int)gy;
|
||||
int y2 = (y1 >= src_h - 1) ? src_h - 1 : y1 + 1;
|
||||
float ty = gy - y1;
|
||||
|
||||
for (int x = 0; x < dst_w; x++)
|
||||
{
|
||||
float gx = ((float)x) / scale;
|
||||
int x1 = (int)gx;
|
||||
int x2 = (x1 >= src_w - 1) ? src_w - 1 : x1 + 1;
|
||||
float tx = gx - x1;
|
||||
float gy = ((float) y) / scale;
|
||||
int y1 = (int) gy;
|
||||
int y2 = (y1 >= src_h - 1) ? src_h - 1 : y1 + 1;
|
||||
float ty = gy - y1;
|
||||
|
||||
float p00 = src_img[y1 * src_w + x1]; // Top left
|
||||
float p10 = src_img[y1 * src_w + x2]; // Top right
|
||||
float p01 = src_img[y2 * src_w + x1]; // Bottom left
|
||||
float p11 = src_img[y2 * src_w + x2]; // Bottom right
|
||||
for (int x = 0; x < dst_w; x++)
|
||||
{
|
||||
float gx = ((float) x) / scale;
|
||||
int x1 = (int) gx;
|
||||
int x2 = (x1 >= src_w - 1) ? src_w - 1 : x1 + 1;
|
||||
float tx = gx - x1;
|
||||
|
||||
// Interp. horizontally across the top and bottom
|
||||
float top_p = p00 * (1.0f - tx) + p10 * tx;
|
||||
float bottom_p = p01 * (1.0f - tx) + p11 * tx;
|
||||
float p00 = src_img[y1 * src_w + x1]; // Top left
|
||||
float p10 = src_img[y1 * src_w + x2]; // Top right
|
||||
float p01 = src_img[y2 * src_w + x1]; // Bottom left
|
||||
float p11 = src_img[y2 * src_w + x2]; // Bottom right
|
||||
|
||||
// Interp. vertically between the two horizontal results
|
||||
float pixel = top_p * (1.0f - ty) + bottom_p * ty;
|
||||
// Interp. horizontally across the top and bottom
|
||||
float top_p = p00 * (1.0f - tx) + p10 * tx;
|
||||
float bottom_p = p01 * (1.0f - tx) + p11 * tx;
|
||||
|
||||
dst_img[y * dst_w + x] = (guchar)pixel;
|
||||
// Interp. vertically between the two horizontal results
|
||||
float pixel = top_p * (1.0f - ty) + bottom_p * ty;
|
||||
|
||||
// Round instead of floor, just better practice
|
||||
dst_img[y * dst_w + x] = (guchar) (pixel + 0.5f);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -155,159 +157,163 @@ static void upscale_img(guchar *src_img, guchar *dst_img)
|
|||
* center of that canvas.
|
||||
* With this technique I have managed to get scores as high as 32!
|
||||
*/
|
||||
static void upscale_and_pad_img(guchar *img, guchar *canvas)
|
||||
static void
|
||||
upscale_and_pad_img (guchar *img, guchar *canvas)
|
||||
{
|
||||
const int img_width = EGIS0576_IMG_WIDTH_UPSCALE;
|
||||
const int img_height = EGIS0576_IMG_HEIGHT_UPSCALE;
|
||||
|
||||
// Upscale sensor image
|
||||
guchar upscaled_img[EGIS0576_IMG_SIZE_UPSCALE];
|
||||
upscale_img(img, upscaled_img);
|
||||
|
||||
upscale_img (img, upscaled_img);
|
||||
|
||||
// Prepare canvas
|
||||
memset(canvas, 255, EGIS0576_CANVAS_SIZE);
|
||||
memset (canvas, 255, EGIS0576_CANVAS_SIZE);
|
||||
int offset_x = (EGIS0576_CANVAS_WIDTH - img_width) / 2;
|
||||
int offset_y = (EGIS0576_CANVAS_HEIGHT - img_height) / 2;
|
||||
|
||||
for (int y = 0; y < img_height; y++)
|
||||
{
|
||||
for (int x = 0; x < img_width; x++)
|
||||
{
|
||||
int dest_y = y + offset_y;
|
||||
int dest_x = x + offset_x;
|
||||
for (int x = 0; x < img_width; x++)
|
||||
{
|
||||
int dest_y = y + offset_y;
|
||||
int dest_x = x + offset_x;
|
||||
|
||||
canvas[dest_y * EGIS0576_CANVAS_WIDTH + dest_x] = upscaled_img[y * img_width + x];
|
||||
canvas[dest_y * EGIS0576_CANVAS_WIDTH + dest_x] = upscaled_img[y * img_width + x];
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void process_finger(FpDevice *dev, FpiUsbTransfer *transfer)
|
||||
static void
|
||||
process_finger (FpDevice *dev, FpiUsbTransfer *transfer)
|
||||
{
|
||||
FpImageDevice *img_self = FP_IMAGE_DEVICE(dev);
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576(dev);
|
||||
FpImageDevice *img_self = FP_IMAGE_DEVICE (dev);
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576 (dev);
|
||||
|
||||
guchar *img = transfer->buffer;
|
||||
|
||||
gint variance = fpi_std_sq_dev(img, EGIS0576_IMG_SIZE);
|
||||
if (!self->has_background)
|
||||
{
|
||||
/* Background has been gathered, user can put finger on sensor. */
|
||||
if (variance < EGIS0576_BG_VARIANCE)
|
||||
{
|
||||
memcpy(self->background, img, EGIS0576_IMG_SIZE);
|
||||
self->has_background = TRUE;
|
||||
gint variance = fpi_std_sq_dev (img, EGIS0576_IMG_SIZE);
|
||||
|
||||
fpi_device_report_finger_status(dev, FP_FINGER_STATUS_NEEDED);
|
||||
if (!self->has_background)
|
||||
{
|
||||
/* Background has been gathered, user can put finger on sensor. */
|
||||
if (variance < EGIS0576_BG_VARIANCE)
|
||||
{
|
||||
memcpy (self->background, img, EGIS0576_IMG_SIZE);
|
||||
self->has_background = TRUE;
|
||||
|
||||
fpi_device_report_finger_status (dev, FP_FINGER_STATUS_NEEDED);
|
||||
|
||||
self->seq_type = SEQ_REPEAT;
|
||||
fpi_ssm_next_state_delayed (transfer->ssm, 50);
|
||||
return;
|
||||
}
|
||||
|
||||
/* User should remove finger so the driver can grab a clear image. */
|
||||
fpi_image_device_retry_scan (img_self, FP_DEVICE_RETRY_REMOVE_FINGER);
|
||||
|
||||
self->seq_type = SEQ_REPEAT;
|
||||
fpi_ssm_next_state_delayed(transfer->ssm, 50);
|
||||
fpi_ssm_next_state_delayed (transfer->ssm, 500);
|
||||
return;
|
||||
}
|
||||
|
||||
/* User should remove finger so the driver can grab a clear image. */
|
||||
fpi_image_device_retry_scan(img_self, FP_DEVICE_RETRY_REMOVE_FINGER);
|
||||
|
||||
self->seq_type = SEQ_REPEAT;
|
||||
fpi_ssm_next_state_delayed(transfer->ssm, 500);
|
||||
return;
|
||||
}
|
||||
|
||||
gboolean finger_present = FALSE;
|
||||
double dark_portion = -1;
|
||||
if (variance > EGIS0576_VARIANCE)
|
||||
{
|
||||
normalize_img(self->background, img, &dark_portion);
|
||||
finger_present = dark_portion > EGIS0576_DARK_PORTION;
|
||||
}
|
||||
{
|
||||
normalize_img (self->background, img, &dark_portion);
|
||||
finger_present = dark_portion > EGIS0576_DARK_PORTION;
|
||||
}
|
||||
|
||||
fp_dbg("Finger status (present, variance, dark port) : "
|
||||
"%d , %d, %.2f",
|
||||
finger_present, variance, dark_portion);
|
||||
fp_dbg ("Finger status (present, variance, dark port) : "
|
||||
"%d , %d, %.2f",
|
||||
finger_present, variance, dark_portion);
|
||||
|
||||
if (!finger_present)
|
||||
{
|
||||
self->seq_type = SEQ_REPEAT;
|
||||
fpi_image_device_report_finger_status(img_self, FALSE);
|
||||
fpi_ssm_next_state_delayed(transfer->ssm, 50);
|
||||
return;
|
||||
}
|
||||
{
|
||||
self->seq_type = SEQ_REPEAT;
|
||||
fpi_image_device_report_finger_status (img_self, FALSE);
|
||||
fpi_ssm_next_state_delayed (transfer->ssm, 50);
|
||||
return;
|
||||
}
|
||||
|
||||
FpImage *fp_img = fp_image_new(EGIS0576_CANVAS_WIDTH, EGIS0576_CANVAS_HEIGHT);
|
||||
FpImage *fp_img = fp_image_new (EGIS0576_CANVAS_WIDTH, EGIS0576_CANVAS_HEIGHT);
|
||||
/* Sensor returns full image */
|
||||
upscale_and_pad_img(img, fp_img->data);
|
||||
upscale_and_pad_img (img, fp_img->data);
|
||||
|
||||
fpi_image_device_report_finger_status(img_self, TRUE);
|
||||
fpi_image_device_image_captured(img_self, fp_img);
|
||||
fpi_image_device_report_finger_status (img_self, TRUE);
|
||||
fpi_image_device_image_captured (img_self, fp_img);
|
||||
|
||||
fpi_ssm_next_state_delayed(transfer->ssm, 50);
|
||||
fpi_ssm_next_state_delayed (transfer->ssm, 50);
|
||||
}
|
||||
|
||||
static void process_poll_transfer(FpDevice *dev, FpiUsbTransfer *transfer)
|
||||
static void
|
||||
process_poll_transfer (FpDevice *dev, FpiUsbTransfer *transfer)
|
||||
{
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576(dev);
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576 (dev);
|
||||
|
||||
if (transfer->actual_length < 6)
|
||||
{
|
||||
GError *error
|
||||
= fpi_device_error_new_msg(FP_DEVICE_ERROR_DATA_INVALID, "Device reported invalid poll.");
|
||||
fpi_ssm_mark_failed(transfer->ssm, error);
|
||||
g_error_free(error);
|
||||
return;
|
||||
}
|
||||
{
|
||||
GError *error
|
||||
= fpi_device_error_new_msg (FP_DEVICE_ERROR_DATA_INVALID, "Device reported invalid poll.");
|
||||
fpi_ssm_mark_failed (transfer->ssm, error);
|
||||
g_error_free (error);
|
||||
return;
|
||||
}
|
||||
|
||||
if ((transfer->buffer[6] & 0x01) == 0x01)
|
||||
{
|
||||
self->seq_type = SEQ_IMAGE;
|
||||
fpi_ssm_jump_to_state(transfer->ssm, DEV_REQ);
|
||||
return;
|
||||
}
|
||||
{
|
||||
self->seq_type = SEQ_IMAGE;
|
||||
fpi_ssm_jump_to_state (transfer->ssm, DEV_REQ);
|
||||
return;
|
||||
}
|
||||
|
||||
self->seq_pkt_index += 1;
|
||||
if (self->seq_pkt_index < EGIS0576_POLL_COUNT)
|
||||
{
|
||||
fpi_ssm_jump_to_state(transfer->ssm, DEV_REQ);
|
||||
return;
|
||||
}
|
||||
{
|
||||
fpi_ssm_jump_to_state (transfer->ssm, DEV_REQ);
|
||||
return;
|
||||
}
|
||||
|
||||
GError *error
|
||||
= fpi_device_error_new_msg(FP_DEVICE_ERROR_GENERAL, "Device exceeded maximum poll count.");
|
||||
fpi_ssm_mark_failed(transfer->ssm, error);
|
||||
g_error_free(error);
|
||||
= fpi_device_error_new_msg (FP_DEVICE_ERROR_GENERAL, "Device exceeded maximum poll count.");
|
||||
fpi_ssm_mark_failed (transfer->ssm, error);
|
||||
g_error_free (error);
|
||||
}
|
||||
|
||||
/* Verifies that received data is processable. */
|
||||
static void process_image_transfer(FpDevice *dev, FpiUsbTransfer *transfer)
|
||||
static void
|
||||
process_image_transfer (FpDevice *dev, FpiUsbTransfer *transfer)
|
||||
{
|
||||
guchar *buffer = transfer->buffer;
|
||||
gssize buffer_len = transfer->actual_length;
|
||||
|
||||
if (buffer_len != EGIS0576_IMG_SIZE)
|
||||
{
|
||||
GError *error = fpi_device_error_new_msg(
|
||||
FP_DEVICE_ERROR_DATA_INVALID, "Device image data size does not match expected size.");
|
||||
fpi_ssm_mark_failed(transfer->ssm, error);
|
||||
g_error_free(error);
|
||||
return;
|
||||
}
|
||||
{
|
||||
GError *error = fpi_device_error_new_msg (
|
||||
FP_DEVICE_ERROR_DATA_INVALID, "Device image data size does not match expected size.");
|
||||
fpi_ssm_mark_failed (transfer->ssm, error);
|
||||
g_error_free (error);
|
||||
return;
|
||||
}
|
||||
|
||||
uint sum = 0;
|
||||
/* Roughly check whether the buffer is empty aka invalid. */
|
||||
for (int i = 0; i < MIN(buffer_len, 255); i++)
|
||||
{
|
||||
for (int i = 0; i < MIN (buffer_len, 255); i++)
|
||||
sum += buffer[i];
|
||||
}
|
||||
|
||||
/* No/invalid data was present. */
|
||||
if (sum == 0)
|
||||
{
|
||||
GError *error
|
||||
= fpi_device_error_new_msg(FP_DEVICE_ERROR_DATA_INVALID, "Device reported invalid data.");
|
||||
fpi_ssm_mark_failed(transfer->ssm, error);
|
||||
g_error_free(error);
|
||||
return;
|
||||
}
|
||||
{
|
||||
GError *error
|
||||
= fpi_device_error_new_msg (FP_DEVICE_ERROR_DATA_INVALID, "Device reported invalid data.");
|
||||
fpi_ssm_mark_failed (transfer->ssm, error);
|
||||
g_error_free (error);
|
||||
return;
|
||||
}
|
||||
|
||||
process_finger(dev, transfer);
|
||||
process_finger (dev, transfer);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -315,164 +321,171 @@ static void process_image_transfer(FpDevice *dev, FpiUsbTransfer *transfer)
|
|||
* I / O
|
||||
* ========================
|
||||
*/
|
||||
static void cmd_resp_cb(FpiUsbTransfer *transfer, FpDevice *dev, gpointer user_data, GError *error)
|
||||
static void
|
||||
cmd_resp_cb (FpiUsbTransfer *transfer, FpDevice *dev, gpointer user_data, GError *error)
|
||||
{
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576(dev);
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576 (dev);
|
||||
|
||||
if (error)
|
||||
{
|
||||
fp_dbg("During the %d sequence an error occurred at pkt index %d", self->seq_type,
|
||||
self->seq_pkt_index);
|
||||
fpi_ssm_mark_failed(transfer->ssm, error);
|
||||
return;
|
||||
}
|
||||
{
|
||||
fp_dbg ("During the %d sequence an error occurred at pkt index %d", self->seq_type,
|
||||
self->seq_pkt_index);
|
||||
fpi_ssm_mark_failed (transfer->ssm, error);
|
||||
return;
|
||||
}
|
||||
|
||||
switch (self->seq_type)
|
||||
{
|
||||
/* not processed */
|
||||
case SEQ_INIT:
|
||||
case SEQ_REPEAT:
|
||||
fpi_ssm_jump_to_state(transfer->ssm, DEV_REQ);
|
||||
break;
|
||||
{
|
||||
/* not processed */
|
||||
case SEQ_INIT:
|
||||
case SEQ_REPEAT:
|
||||
fpi_ssm_jump_to_state (transfer->ssm, DEV_REQ);
|
||||
break;
|
||||
|
||||
case SEQ_POLL:
|
||||
process_poll_transfer(dev, transfer);
|
||||
break;
|
||||
case SEQ_POLL:
|
||||
process_poll_transfer (dev, transfer);
|
||||
break;
|
||||
|
||||
case SEQ_IMAGE:
|
||||
process_image_transfer(dev, transfer);
|
||||
break;
|
||||
}
|
||||
case SEQ_IMAGE:
|
||||
process_image_transfer (dev, transfer);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void recv_cmd_resp(FpiSsm *ssm, FpDevice *dev, Egis0576Pkt last_pkt)
|
||||
static void
|
||||
recv_cmd_resp (FpiSsm *ssm, FpDevice *dev, Egis0576Pkt last_pkt)
|
||||
{
|
||||
FpiUsbTransfer *transfer = fpi_usb_transfer_new(dev);
|
||||
FpiUsbTransfer *transfer = fpi_usb_transfer_new (dev);
|
||||
|
||||
fpi_usb_transfer_fill_bulk(transfer, EGIS0576_EPIN, last_pkt.res_len);
|
||||
fpi_usb_transfer_fill_bulk (transfer, EGIS0576_EPIN, last_pkt.res_len);
|
||||
|
||||
transfer->ssm = ssm;
|
||||
|
||||
fpi_usb_transfer_submit(transfer, EGIS0576_TIMEOUT, NULL, cmd_resp_cb, NULL);
|
||||
fpi_usb_transfer_submit (transfer, EGIS0576_TIMEOUT, NULL, cmd_resp_cb, NULL);
|
||||
}
|
||||
|
||||
static void send_cmd_req(FpiSsm *ssm, FpDevice *dev, Egis0576Pkt pkt)
|
||||
static void
|
||||
send_cmd_req (FpiSsm *ssm, FpDevice *dev, Egis0576Pkt pkt)
|
||||
{
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576(dev);
|
||||
FpiUsbTransfer *transfer = fpi_usb_transfer_new(dev);
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576 (dev);
|
||||
FpiUsbTransfer *transfer = fpi_usb_transfer_new (dev);
|
||||
|
||||
self->last_sent_pkt = pkt;
|
||||
fpi_usb_transfer_fill_bulk_full(transfer, EGIS0576_EPOUT, pkt.cmd, pkt.len, NULL);
|
||||
fpi_usb_transfer_fill_bulk_full (transfer, EGIS0576_EPOUT, pkt.cmd, pkt.len, NULL);
|
||||
|
||||
transfer->ssm = ssm;
|
||||
transfer->short_is_error = TRUE;
|
||||
|
||||
fpi_usb_transfer_submit(transfer, EGIS0576_TIMEOUT, NULL, fpi_ssm_usb_transfer_cb, NULL);
|
||||
fpi_usb_transfer_submit (transfer, EGIS0576_TIMEOUT, NULL, fpi_ssm_usb_transfer_cb, NULL);
|
||||
}
|
||||
|
||||
static gboolean init_repeat_last_pkt(FpDevice *dev)
|
||||
static gboolean
|
||||
init_repeat_last_pkt (FpDevice *dev)
|
||||
{
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576(dev);
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576 (dev);
|
||||
|
||||
int type = self->seq_type;
|
||||
int index = self->seq_pkt_index;
|
||||
|
||||
return (type == SEQ_INIT && index == EGIS0576_INIT_PACKETS_LENGTH - 1)
|
||||
|| (type == SEQ_REPEAT && index == EGIS0576_REPEAT_PACKETS_LENGTH - 1);
|
||||
return (type == SEQ_INIT && index == EGIS0576_INIT_PACKETS_LENGTH - 1) ||
|
||||
(type == SEQ_REPEAT && index == EGIS0576_REPEAT_PACKETS_LENGTH - 1);
|
||||
}
|
||||
|
||||
static void recv_cmd(FpiSsm *ssm, FpDevice *dev)
|
||||
static void
|
||||
recv_cmd (FpiSsm *ssm, FpDevice *dev)
|
||||
{
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576(dev);
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576 (dev);
|
||||
Egis0576Pkt last_pkt = self->last_sent_pkt;
|
||||
|
||||
switch (self->seq_type)
|
||||
{
|
||||
case SEQ_INIT:
|
||||
case SEQ_REPEAT:
|
||||
if (!init_repeat_last_pkt(dev))
|
||||
{
|
||||
recv_cmd_resp(ssm, dev, last_pkt);
|
||||
self->seq_pkt_index += 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
self->seq_pkt_index = 0;
|
||||
self->seq_type = SEQ_POLL;
|
||||
fpi_ssm_jump_to_state(ssm, DEV_REQ);
|
||||
}
|
||||
case SEQ_INIT:
|
||||
case SEQ_REPEAT:
|
||||
if (!init_repeat_last_pkt (dev))
|
||||
{
|
||||
recv_cmd_resp (ssm, dev, last_pkt);
|
||||
self->seq_pkt_index += 1;
|
||||
}
|
||||
else
|
||||
{
|
||||
self->seq_pkt_index = 0;
|
||||
self->seq_type = SEQ_POLL;
|
||||
fpi_ssm_jump_to_state (ssm, DEV_REQ);
|
||||
}
|
||||
|
||||
break;
|
||||
break;
|
||||
|
||||
case SEQ_POLL:
|
||||
case SEQ_IMAGE:
|
||||
recv_cmd_resp(ssm, dev, last_pkt);
|
||||
break;
|
||||
}
|
||||
case SEQ_POLL:
|
||||
case SEQ_IMAGE:
|
||||
recv_cmd_resp (ssm, dev, last_pkt);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void send_cmd(FpiSsm *ssm, FpDevice *dev)
|
||||
static void
|
||||
send_cmd (FpiSsm *ssm, FpDevice *dev)
|
||||
{
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576(dev);
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576 (dev);
|
||||
|
||||
switch (self->seq_type)
|
||||
{
|
||||
case SEQ_INIT:
|
||||
send_cmd_req(ssm, dev, EGIS0576_INIT_PACKETS[self->seq_pkt_index]);
|
||||
break;
|
||||
{
|
||||
case SEQ_INIT:
|
||||
send_cmd_req (ssm, dev, EGIS0576_INIT_PACKETS[self->seq_pkt_index]);
|
||||
break;
|
||||
|
||||
case SEQ_REPEAT:
|
||||
send_cmd_req(ssm, dev, EGIS0576_REPEAT_PACKETS[self->seq_pkt_index]);
|
||||
break;
|
||||
case SEQ_REPEAT:
|
||||
send_cmd_req (ssm, dev, EGIS0576_REPEAT_PACKETS[self->seq_pkt_index]);
|
||||
break;
|
||||
|
||||
case SEQ_POLL:
|
||||
send_cmd_req(ssm, dev, EGIS0576_POLL_PACKET);
|
||||
break;
|
||||
case SEQ_POLL:
|
||||
send_cmd_req (ssm, dev, EGIS0576_POLL_PACKET);
|
||||
break;
|
||||
|
||||
case SEQ_IMAGE:
|
||||
send_cmd_req(ssm, dev, EGIS0576_IMAGE_PACKET);
|
||||
break;
|
||||
}
|
||||
case SEQ_IMAGE:
|
||||
send_cmd_req (ssm, dev, EGIS0576_IMAGE_PACKET);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static void ssm_run_state(FpiSsm *ssm, FpDevice *dev)
|
||||
static void
|
||||
ssm_run_state (FpiSsm *ssm, FpDevice *dev)
|
||||
{
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576(dev);
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576 (dev);
|
||||
|
||||
switch (fpi_ssm_get_cur_state(ssm))
|
||||
{
|
||||
case DEV_OPEN:
|
||||
self->seq_type = SEQ_INIT;
|
||||
fpi_ssm_jump_to_state(ssm, DEV_START);
|
||||
break;
|
||||
|
||||
case DEV_START:
|
||||
if (self->stop)
|
||||
switch (fpi_ssm_get_cur_state (ssm))
|
||||
{
|
||||
fp_dbg("Deactivating device, marking completed.");
|
||||
fpi_ssm_mark_completed(ssm);
|
||||
return;
|
||||
case DEV_OPEN:
|
||||
self->seq_type = SEQ_INIT;
|
||||
fpi_ssm_jump_to_state (ssm, DEV_START);
|
||||
break;
|
||||
|
||||
case DEV_START:
|
||||
if (self->stop)
|
||||
{
|
||||
fp_dbg ("Deactivating device, marking completed.");
|
||||
fpi_ssm_mark_completed (ssm);
|
||||
return;
|
||||
}
|
||||
|
||||
self->seq_pkt_index = 0;
|
||||
fpi_ssm_jump_to_state (ssm, DEV_REQ);
|
||||
break;
|
||||
|
||||
case DEV_REQ:
|
||||
send_cmd (ssm, dev);
|
||||
break;
|
||||
|
||||
case DEV_RESP:
|
||||
recv_cmd (ssm, dev);
|
||||
break;
|
||||
|
||||
case DEV_FULFILLED:
|
||||
fpi_ssm_jump_to_state (ssm, DEV_START);
|
||||
break;
|
||||
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
|
||||
self->seq_pkt_index = 0;
|
||||
fpi_ssm_jump_to_state(ssm, DEV_REQ);
|
||||
break;
|
||||
|
||||
case DEV_REQ:
|
||||
send_cmd(ssm, dev);
|
||||
break;
|
||||
|
||||
case DEV_RESP:
|
||||
recv_cmd(ssm, dev);
|
||||
break;
|
||||
|
||||
case DEV_FULFILLED:
|
||||
fpi_ssm_jump_to_state(ssm, DEV_START);
|
||||
break;
|
||||
|
||||
default:
|
||||
g_assert_not_reached();
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -481,75 +494,80 @@ static void ssm_run_state(FpiSsm *ssm, FpDevice *dev)
|
|||
* ========================
|
||||
*/
|
||||
|
||||
static void sm_cb(FpiSsm *ssm, FpDevice *dev, GError *error)
|
||||
static void
|
||||
sm_cb (FpiSsm *ssm, FpDevice *dev, GError *error)
|
||||
{
|
||||
FpImageDevice *img_dev = FP_IMAGE_DEVICE(dev);
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576(dev);
|
||||
FpImageDevice *img_dev = FP_IMAGE_DEVICE (dev);
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576 (dev);
|
||||
|
||||
self->running = FALSE;
|
||||
|
||||
if (error && !self->stop)
|
||||
fpi_image_device_session_error(img_dev, error);
|
||||
fpi_image_device_session_error (img_dev, error);
|
||||
else if (error)
|
||||
g_error_free(error);
|
||||
g_error_free (error);
|
||||
|
||||
if (self->stop)
|
||||
fpi_image_device_deactivate_complete(img_dev, NULL);
|
||||
fpi_image_device_deactivate_complete (img_dev, NULL);
|
||||
}
|
||||
|
||||
/*
|
||||
* Device activate
|
||||
*/
|
||||
static void dev_activate(FpImageDevice *dev)
|
||||
static void
|
||||
dev_activate (FpImageDevice *dev)
|
||||
{
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576(dev);
|
||||
FpiSsm *ssm = fpi_ssm_new(FP_DEVICE(dev), ssm_run_state, NUM_STATES);
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576 (dev);
|
||||
FpiSsm *ssm = fpi_ssm_new (FP_DEVICE (dev), ssm_run_state, NUM_STATES);
|
||||
|
||||
self->stop = FALSE;
|
||||
|
||||
fpi_ssm_start(ssm, sm_cb);
|
||||
fpi_ssm_start (ssm, sm_cb);
|
||||
|
||||
self->running = TRUE;
|
||||
|
||||
fpi_image_device_activate_complete(dev, NULL);
|
||||
fpi_image_device_activate_complete (dev, NULL);
|
||||
}
|
||||
|
||||
/*
|
||||
* Img open
|
||||
*/
|
||||
static void dev_init(FpImageDevice *dev)
|
||||
static void
|
||||
dev_init (FpImageDevice *dev)
|
||||
{
|
||||
GError *error = NULL;
|
||||
|
||||
g_usb_device_claim_interface(fpi_device_get_usb_device(FP_DEVICE(dev)), EGIS0576_INTF, 0, &error);
|
||||
g_usb_device_claim_interface (fpi_device_get_usb_device (FP_DEVICE (dev)), EGIS0576_INTF, 0, &error);
|
||||
|
||||
fpi_image_device_open_complete(dev, error);
|
||||
fpi_image_device_open_complete (dev, error);
|
||||
}
|
||||
|
||||
/*
|
||||
* Img close
|
||||
*/
|
||||
static void dev_deinit(FpImageDevice *dev)
|
||||
static void
|
||||
dev_deinit (FpImageDevice *dev)
|
||||
{
|
||||
GError *error = NULL;
|
||||
|
||||
g_usb_device_release_interface(fpi_device_get_usb_device(FP_DEVICE(dev)), EGIS0576_INTF, 0,
|
||||
&error);
|
||||
g_usb_device_release_interface (fpi_device_get_usb_device (FP_DEVICE (dev)), EGIS0576_INTF, 0,
|
||||
&error);
|
||||
|
||||
fpi_image_device_close_complete(dev, error);
|
||||
fpi_image_device_close_complete (dev, error);
|
||||
}
|
||||
|
||||
/*
|
||||
* Device deactivate
|
||||
*/
|
||||
static void dev_deactivate(FpImageDevice *dev)
|
||||
static void
|
||||
dev_deactivate (FpImageDevice *dev)
|
||||
{
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576(dev);
|
||||
FpDeviceEgis0576 *self = FPI_DEVICE_EGIS0576 (dev);
|
||||
|
||||
if (self->running)
|
||||
self->stop = TRUE;
|
||||
else
|
||||
fpi_image_device_deactivate_complete(dev, NULL);
|
||||
fpi_image_device_deactivate_complete (dev, NULL);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -566,14 +584,16 @@ static const FpIdEntry id_table[] = {
|
|||
},
|
||||
};
|
||||
|
||||
static void fpi_device_egis0576_init(FpDeviceEgis0576 *self)
|
||||
static void
|
||||
fpi_device_egis0576_init (FpDeviceEgis0576 *self)
|
||||
{
|
||||
}
|
||||
|
||||
static void fpi_device_egis0576_class_init(FpDeviceEgis0576Class *klass)
|
||||
static void
|
||||
fpi_device_egis0576_class_init (FpDeviceEgis0576Class *klass)
|
||||
{
|
||||
FpDeviceClass *dev_class = FP_DEVICE_CLASS(klass);
|
||||
FpImageDeviceClass *img_class = FP_IMAGE_DEVICE_CLASS(klass);
|
||||
FpDeviceClass *dev_class = FP_DEVICE_CLASS (klass);
|
||||
FpImageDeviceClass *img_class = FP_IMAGE_DEVICE_CLASS (klass);
|
||||
|
||||
dev_class->id = "egis0576";
|
||||
dev_class->full_name = "Egis Technology Inc. (aka. LighTuning) 0576";
|
||||
|
|
|
|||
|
|
@ -22,36 +22,36 @@
|
|||
|
||||
/* Device endpoints */
|
||||
#define EGIS0576_EPOUT 0x01
|
||||
#define EGIS0576_EPIN 0x82
|
||||
#define EGIS0576_EPIN 0x82
|
||||
|
||||
/* Device transfers */
|
||||
#define EGIS0576_TIMEOUT 10000
|
||||
#define EGIS0576_TIMEOUT 10000
|
||||
#define EGIS0576_POLL_COUNT 3000
|
||||
|
||||
/* Sensor image */
|
||||
#define EGIS0576_IMG_WIDTH 70
|
||||
#define EGIS0576_IMG_WIDTH 70
|
||||
#define EGIS0576_IMG_HEIGHT 57
|
||||
#define EGIS0576_IMG_SIZE ((EGIS0576_IMG_WIDTH) * (EGIS0576_IMG_HEIGHT))
|
||||
#define EGIS0576_IMG_SIZE ((EGIS0576_IMG_WIDTH) *(EGIS0576_IMG_HEIGHT))
|
||||
|
||||
/* Upscaled sensor image */
|
||||
#define EGIS0576_IMG_UPSCALE 2
|
||||
#define EGIS0576_IMG_WIDTH_UPSCALE ((EGIS0576_IMG_WIDTH) * (EGIS0576_IMG_UPSCALE))
|
||||
#define EGIS0576_IMG_HEIGHT_UPSCALE ((EGIS0576_IMG_HEIGHT) * (EGIS0576_IMG_UPSCALE))
|
||||
#define EGIS0576_IMG_SIZE_UPSCALE ((EGIS0576_IMG_WIDTH_UPSCALE) * (EGIS0576_IMG_HEIGHT_UPSCALE))
|
||||
#define EGIS0576_IMG_UPSCALE 2
|
||||
#define EGIS0576_IMG_WIDTH_UPSCALE ((EGIS0576_IMG_WIDTH) *(EGIS0576_IMG_UPSCALE))
|
||||
#define EGIS0576_IMG_HEIGHT_UPSCALE ((EGIS0576_IMG_HEIGHT) *(EGIS0576_IMG_UPSCALE))
|
||||
#define EGIS0576_IMG_SIZE_UPSCALE ((EGIS0576_IMG_WIDTH_UPSCALE) *(EGIS0576_IMG_HEIGHT_UPSCALE))
|
||||
|
||||
/* Canvas image */
|
||||
#define EGIS0576_CANVAS_WIDTH 256
|
||||
#define EGIS0576_CANVAS_WIDTH 256
|
||||
#define EGIS0576_CANVAS_HEIGHT 256
|
||||
#define EGIS0576_CANVAS_SIZE ((EGIS0576_CANVAS_WIDTH) * (EGIS0576_CANVAS_HEIGHT))
|
||||
#define EGIS0576_CANVAS_SIZE ((EGIS0576_CANVAS_WIDTH) *(EGIS0576_CANVAS_HEIGHT))
|
||||
|
||||
/*
|
||||
* These values were acquired by testing with finger present and without finger
|
||||
* present.
|
||||
*/
|
||||
#define EGIS0576_CONTRAST 4
|
||||
#define EGIS0576_VARIANCE (3.2 * 3.2)
|
||||
#define EGIS0576_CONTRAST 4
|
||||
#define EGIS0576_VARIANCE (3.2 * 3.2)
|
||||
#define EGIS0576_DARK_PORTION 0.05
|
||||
#define EGIS0576_BG_VARIANCE (2.5 * 2.5)
|
||||
#define EGIS0576_BG_VARIANCE (2.5 * 2.5)
|
||||
|
||||
/*
|
||||
*
|
||||
|
|
@ -90,9 +90,9 @@
|
|||
*/
|
||||
typedef struct
|
||||
{
|
||||
int len;
|
||||
int len;
|
||||
unsigned char *cmd;
|
||||
int res_len;
|
||||
int res_len;
|
||||
} Egis0576Pkt;
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue