Merge branch 'master' of git://github.com/chunkeey/carl9170fw

[carl9170fw.git] / tools / carlu / src / usb.h

diff --git a/tools/carlu/src/usb.h b/tools/carlu/src/usb.h
index 298e82d14ad76048328ab9b89e134401925bf4ee..66c674f951bf9ab050a42f064cedb9ba23886e7f 100644 (file)
--- a/tools/carlu/src/usb.h
+++ b/tools/carlu/src/usb.h
@@ -1,9 +1,9 @@
 /*
- * carl9170user - userspace testing utility for ar9170 devices
+ * carlu - userspace testing utility for ar9170 devices
  *
  * USB back-end API declaration
  *
- * Copyright 2009, 2010 Christian Lamparter <chunkeey@googlemail.com>
+ * Copyright 2009-2011 Christian Lamparter <chunkeey@googlemail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,6 +31,7 @@
 
 #include "fwcmd.h"
 #include <unistd.h>
+#include "carlu.h"
 
 #define AR9170_RX_BULK_BUFS            16
 #define AR9170_RX_BULK_BUF_SIZE                8192
@@ -44,36 +45,11 @@
 
 #define AR9170_TX_MAX_ACTIVE_URBS              8
 
-#define CARL9170_FIRMWARE_FILE "/lib/firmware/carl9170-1"
-void carlusb_reset_txep(struct carlu *ar);
-
-struct carlusb {
-       struct carlu common;
-       libusb_device_handle *dev;
-       libusb_context *ctx;
-
-       SDL_Thread *event_thread;
-       bool stop_event_polling;
-
-       struct libusb_transfer *rx_ring[AR9170_RX_BULK_BUFS];
-
-       struct libusb_transfer *rx_interrupt;
-       unsigned char irq_buf[AR9170_RX_BULK_IRQ_SIZE];
+#define CARL9170_FIRMWARE_FILE (CARLU_PATH "/../../carlfw/carl9170.fw")
 
-       unsigned char cmd_buf[CARL9170_MAX_CMD_LEN];
+struct carlu;
 
-       struct list_head tx_queue;
-       SDL_mutex *tx_queue_lock;
-       unsigned int tx_queue_len;
-
-       struct list_head dev_list;
-       unsigned int idx;
-
-       unsigned int miniboot_size;
-       unsigned int rx_max;
-
-       int event_pipe[2];
-};
+void carlusb_reset_txep(struct carlu *ar);
 
 int usb_init(void);
 void usb_exit(void);
@@ -82,7 +58,7 @@ struct carlu *carlusb_probe(void);
 void carlusb_close(struct carlu *ar);
 
 void carlusb_tx(struct carlu *ar, struct frame *frame);
-int carlusb_fw_check(struct carlusb *ar);
+int carlusb_fw_check(struct carlu *ar);
 
 int carlusb_cmd(struct carlu *_ar, uint8_t oid, uint8_t *cmd, size_t clen,
                uint8_t *rsp, size_t rlen);