Skip to content

mice: I_wacom_RequestData: remove useless arg #35

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

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

mice: I_wacom_RequestData: remove useless arg #35

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
9 changes: 5 additions & 4 deletions src/mice.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1794,9 +1794,10 @@ static int I_wacom_wait_wacom(int fd)
}

static int I_wacom_RequestData(char *cmd, int fd, char *buffer,
unsigned int buffer_len, char *p)
unsigned int buffer_len)
{
int err;
char *p;
/*
* Send cmd if not null, and get back answer from tablet.
* Get Data to buffer until full or timeout.
Expand Down Expand Up @@ -1840,10 +1841,10 @@ static Gpm_Type *I_wacom(int fd, unsigned short flags,
I_wacom_reset_wacom(fd);

/* "Flush" input queque */
while(I_wacom_RequestData(NULL, fd, buffer, BUFFER_SIZE, p)) ;
while(I_wacom_RequestData(NULL, fd, buffer, BUFFER_SIZE));

/* read WACOM-ID */
I_wacom_RequestData(UD_FIRMID, fd, buffer, BUFFER_SIZE, p);
I_wacom_RequestData(UD_FIRMID, fd, buffer, BUFFER_SIZE);

/* Search for matching modell */
for(WacomModell=0;
Expand All @@ -1864,7 +1865,7 @@ static Gpm_Type *I_wacom(int fd, unsigned short flags,

/* read Wacom max size */
if(WacomModell!=(-1) && (!wcmodell[WacomModell].maxX)) {
I_wacom_RequestData(UD_COORD, fd, buffer, BUFFER_SIZE, p);
I_wacom_RequestData(UD_COORD, fd, buffer, BUFFER_SIZE);
sscanf(buffer+2, "%d,%d", &wmaxx, &wmaxy);
wmaxx = (wmaxx-wcmodell[WacomModell].border);
wmaxy = (wmaxy-wcmodell[WacomModell].border);
Expand Down