jackcartersmith/xilinx-usb-driver
Archived
1
0
Fork 0
Code Releases Activity

remove no longer needed dummy_interrupt mutex

Browse Source
This commit is contained in:
Michael Gernoth 2008-04-14 23:18:24 +02:00
parent 787300f60e
commit 614a4da1e8
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
xpcu.c
View File

@ -26,7 +26,6 @@ struct xpcu_event_s {
}; };
static struct usb_bus *busses = NULL; static struct usb_bus *busses = NULL;
static pthread_mutex_t dummy_interrupt = PTHREAD_MUTEX_INITIALIZER;
int xpcu_deviceinfo(struct usb_get_device_data *ugdd) { int xpcu_deviceinfo(struct usb_get_device_data *ugdd) {
struct xpcu_s *xpcu = (struct xpcu_s*)ugdd->dwUniqueID; struct xpcu_s *xpcu = (struct xpcu_s*)ugdd->dwUniqueID;
@ -489,21 +488,20 @@ int xpcu_close(struct event *e) {
int xpcu_int_state(struct interrupt *it, int enable) { int xpcu_int_state(struct interrupt *it, int enable) {
struct xpcu_event_s *xpcu_event = (struct xpcu_event_s*)it->hInterrupt; struct xpcu_event_s *xpcu_event = (struct xpcu_event_s*)it->hInterrupt;
pthread_mutex_t *interrupt = &dummy_interrupt;
if (xpcu_event) if (!xpcu_event)
interrupt = &xpcu_event->interrupt; return -ENODEV;
if (enable == ENABLE_INTERRUPT) { if (enable == ENABLE_INTERRUPT) {
it->fEnableOk = 1; it->fEnableOk = 1;
it->fStopped = 0; it->fStopped = 0;
it->dwCounter = 0; it->dwCounter = 0;
pthread_mutex_trylock(interrupt); pthread_mutex_trylock(&xpcu_event->interrupt);
} else { } else {
it->dwCounter = 0; it->dwCounter = 0;
it->fStopped = 1; it->fStopped = 1;
if (pthread_mutex_trylock(interrupt) == EBUSY) if (pthread_mutex_trylock(&xpcu_event->interrupt) == EBUSY)
pthread_mutex_unlock(interrupt); pthread_mutex_unlock(&xpcu_event->interrupt);
} }
return 0; return 0;
@ -512,18 +510,16 @@ int xpcu_int_state(struct interrupt *it, int enable) {
int xpcu_int_wait(struct interrupt *it) { int xpcu_int_wait(struct interrupt *it) {
struct xpcu_event_s *xpcu_event = (struct xpcu_event_s*)it->hInterrupt; struct xpcu_event_s *xpcu_event = (struct xpcu_event_s*)it->hInterrupt;
if (xpcu_event) { if (!xpcu_event)
if (it->dwCounter < xpcu_event->count) { return -ENODEV;
it->dwCounter++;
} else { if (it->dwCounter < xpcu_event->count) {
pthread_mutex_lock(&xpcu_event->interrupt); it->dwCounter++;
pthread_mutex_unlock(&xpcu_event->interrupt);
}
xpcu_event->interrupt_count++;
} else { } else {
pthread_mutex_lock(&dummy_interrupt); pthread_mutex_lock(&xpcu_event->interrupt);
pthread_mutex_unlock(&dummy_interrupt); pthread_mutex_unlock(&xpcu_event->interrupt);
} }
xpcu_event->interrupt_count++;
return 0; return 0;
} }