aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars-Dominik Braun <PromyLOPh@lavabit.com>2009-05-09 13:14:40 +0200
committerLars-Dominik Braun <PromyLOPh@lavabit.com>2009-05-09 13:14:40 +0200
commit5c2e36136f0c6801ef73ddeaff7f7d4ac412681f (patch)
tree8e0a17aa0071de6981739a260486ba28aaf2bd1f
parent454110e1b17214b220317704f092bd3587b88a9d (diff)
downloadmpiosh-5c2e36136f0c6801ef73ddeaff7f7d4ac412681f.tar.gz
mpiosh-5c2e36136f0c6801ef73ddeaff7f7d4ac412681f.tar.bz2
mpiosh-5c2e36136f0c6801ef73ddeaff7f7d4ac412681f.zip
Really drop kernel module
-rw-r--r--libmpio/defs.h1
-rw-r--r--libmpio/src/io.c36
2 files changed, 0 insertions, 37 deletions
diff --git a/libmpio/defs.h b/libmpio/defs.h
index f534a4e..f3d0aed 100644
--- a/libmpio/defs.h
+++ b/libmpio/defs.h
@@ -298,7 +298,6 @@ typedef struct {
CHAR version[CMD_SIZE];
int fd;
- int use_libusb;
struct usb_bus *usb_busses;
struct usb_bus *usb_bus;
struct usb_dev_handle *usb_handle;
diff --git a/libmpio/src/io.c b/libmpio/src/io.c
index 5684f6d..fff3b25 100644
--- a/libmpio/src/io.c
+++ b/libmpio/src/io.c
@@ -509,21 +509,10 @@ mpio_device_open(mpio_t *m){
struct usb_interface_descriptor *interface;
struct usb_endpoint_descriptor *ep;
int ret, i;
- m->use_libusb=1;
if (m->fd)
return MPIO_OK;
-#ifdef USE_KMODULE
- debugn(2, "trying kernel module\n");
- m->fd = open(MPIO_DEVICE, O_RDWR);
- if (m->fd > 0) {
- debugn(2, "using kernel module\n");
- m->use_libusb=0;
- return MPIO_OK;
- }
-#endif
-
debugn(2, "trying libusb\n");
usb_init();
usb_find_busses();
@@ -596,22 +585,11 @@ mpio_device_open(mpio_t *m){
int
mpio_device_close(mpio_t *m) {
- if(m->use_libusb) {
if (m->fd) {
debugn(2, "closing libusb\n");
usb_close(m->usb_handle);
m->fd=0;
}
- }
-#ifdef USE_KMODULE
- else {
- if (m->fd) {
- debugn(2, "closing kernel module\n");
- close(m->fd);
- m->fd=0;
- }
- }
-#endif
return MPIO_OK;
}
@@ -706,18 +684,11 @@ mpio_io_bulk_write(int fd, CHAR *block, int num_bytes)
int
mpio_io_write(mpio_t *m, CHAR *block, int num_bytes)
{
- if (m->use_libusb) {
int r;
r = usb_bulk_write(m->usb_handle, m->usb_out_ep, block, num_bytes, MPIO_USB_TIMEOUT);
if (r < 0)
debug("libusb returned error: (%08x) \"%s\"\n", r, usb_strerror());
return r;
- }
-#ifdef USE_KMODULE
- else {
- return mpio_io_bulk_write(m->fd, block, num_bytes);
- }
-#endif
}
@@ -759,18 +730,11 @@ mpio_io_bulk_read (int fd, CHAR *block, int num_bytes)
int
mpio_io_read (mpio_t *m, CHAR *block, int num_bytes)
{
- if (m->use_libusb) {
int r;
r = usb_bulk_read(m->usb_handle, m->usb_in_ep, block, num_bytes, MPIO_USB_TIMEOUT);
if (r < 0)
debug("libusb returned error: (%08x) \"%s\"\n", r, usb_strerror());
return r;
- }
-#ifdef USE_KMODULE
- else {
- return mpio_io_bulk_read(m->fd, block, num_bytes);
- }
-#endif
}