Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

scanbuttond hp5590 backend: Use ISO C types #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

scanbuttond hp5590 backend: Use ISO C types #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/scanbuttond/backends/hp5590.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,17 +268,17 @@ scanbtnd_close(scanner_t* scanner)
/* Structure describing control URB */
struct usb_in_usb_ctrl_setup
{
u_int8_t bRequestType;
u_int8_t bRequest;
u_int16_t wValue;
u_int16_t wIndex;
u_int16_t wLength;
uint8_t bRequestType;
uint8_t bRequest;
uint16_t wValue;
uint16_t wIndex;
uint16_t wLength;
} __attribute__ ((packed));

static int
hp5590_get_ack (scanner_t *scanner)
{
u_int8_t status;
uint8_t status;
int ret;

/* Check if USB-in-USB operation was accepted */
Expand Down Expand Up @@ -312,8 +312,8 @@ hp5590_control_msg (scanner_t *scanner,
int ret;
unsigned int len;
unsigned char *ptr;
u_int8_t ack;
u_int8_t response;
uint8_t ack;
uint8_t response;

/* IN (read) operation will be performed */
if (requesttype & USB_DIR_IN)
Expand Down Expand Up @@ -478,7 +478,7 @@ hp5590_control_msg (scanner_t *scanner,
static int
hp5590_verify_last_cmd (scanner_t *scanner, unsigned int cmd)
{
u_int16_t verify_cmd;
uint16_t verify_cmd;
unsigned int last_cmd;
unsigned int core_status;
int ret;
Expand Down Expand Up @@ -534,7 +534,7 @@ int
scanbtnd_get_button(scanner_t* scanner)
{
int button = 0;
u_int16_t button_status;
uint16_t button_status;
int ret;

if (!scanner->is_open)
Expand Down