Merging upstream version 20240610.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

14 files changed, 0 insertions, 2627 deletions

diff --git a/carl9170fw/tools/carlu/CMakeLists.txt b/carl9170fw/tools/carlu/CMakeLists.txt
deleted file mode 100644
index 0ea6a05..0000000
--- a/carl9170fw/tools/carlu/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project(carlu)
-
-find_package(SDL REQUIRED)
-find_package(USB-1.0 REQUIRED)
-
-set(carlu_src src/debug.c src/cmd.c src/usb.c src/rx.c src/tx.c src/fw.c
-	      src/test.c src/main.c)
-
-add_definitions(-D_GNU_SOURCE ${USB-1.0_DEFINITIONS})
-add_definitions(-DCARLU_PATH="${CMAKE_CURRENT_SOURCE_DIR}")
-
-include_directories(${SDL_INCLUDE_DIR} ${USB-1.0_INCLUDE_DIRS})
-
-add_executable(carlu ${carlu_src})
-
-target_link_libraries (carlu ${SDL_LIBRARY} ${USB-1.0_LIBRARIES} SDLmain carlfw)
diff --git a/carl9170fw/tools/carlu/src/carlu.h b/carl9170fw/tools/carlu/src/carlu.h
deleted file mode 100644
index 5e2c6bb..0000000
--- a/carl9170fw/tools/carlu/src/carlu.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * carlu - userspace testing utility for ar9170 devices
- *
- * common API declaration
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef __CARL9170USER_H
-#define __CARL9170USER_H
-
-#include "SDL.h"
-#include "SDL_thread.h"
-
-#include "carlfw.h"
-
-#include "debug.h"
-#include "hw.h"
-#include "fwcmd.h"
-#include "frame.h"
-#include "eeprom.h"
-#include "ieee80211.h"
-#include "wlan.h"
-#include "usb.h"
-
-struct carlu {
-	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];
-
-	union {
-		unsigned char buf[CARL9170_MAX_CMD_LEN];
-		uint32_t buf4[CARL9170_MAX_CMD_LEN / sizeof(uint32_t)];
-		struct carl9170_cmd cmd;
-		struct carl9170_rsp rsp;
-	} cmd;
-
-	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];
-
-	SDL_cond *resp_pend;
-	SDL_mutex *resp_lock;
-	uint8_t *resp_buf;
-	size_t resp_len;
-
-	int tx_pending;
-	uint8_t cookie;
-
-	void (*tx_cb)(struct carlu *, struct frame *);
-	void (*tx_fb_cb)(struct carlu *, struct frame *);
-	void (*rx_cb)(struct carlu *, void *, unsigned int);
-	int (*cmd_cb)(struct carlu *, struct carl9170_rsp *,
-		      void *, unsigned int);
-
-	struct carlfw *fw;
-
-	struct ar9170_eeprom eeprom;
-
-	struct frame_queue tx_sent_queue[__AR9170_NUM_TXQ];
-
-	SDL_mutex *mem_lock;
-	unsigned int dma_chunks;
-	unsigned int dma_chunk_size;
-	unsigned int used_dma_chunks;
-
-	unsigned int extra_headroom;
-	bool tx_stream;
-	bool rx_stream;
-
-	/* statistics */
-	unsigned int rxed;
-	unsigned int txed;
-
-	unsigned long tx_octets;
-	unsigned long rx_octets;
-};
-
-struct carlu_rate {
-	int8_t rix;
-	int8_t cnt;
-	uint8_t flags;
-};
-
-struct carlu_tx_info_tx {
-	unsigned int key;
-};
-
-struct carlu_tx_info {
-	uint32_t flags;
-
-	struct carlu_rate rates[CARL9170_TX_MAX_RATES];
-
-	union {
-		struct carlu_tx_info_tx tx;
-	};
-};
-
-static inline struct carlu_tx_info *get_tx_info(struct frame *frame)
-{
-	return (void *) frame->cb;
-}
-
-void *carlu_alloc_driver(size_t size);
-void carlu_free_driver(struct carlu *ar);
-
-int carlu_fw_check(struct carlu *ar);
-void carlu_fw_info(struct carlu *ar);
-
-void carlu_rx(struct carlu *ar, struct frame *frame);
-int carlu_tx(struct carlu *ar, struct frame *frame);
-void carlu_tx_feedback(struct carlu *ar,
-			  struct carl9170_rsp *cmd);
-void carlu_handle_command(struct carlu *ar, void *buf, unsigned int len);
-
-struct frame *carlu_alloc_frame(struct carlu *ar, unsigned int size);
-void carlu_free_frame(struct carlu *ar, struct frame *frame);
-#endif /* __CARL9170USER_H */
diff --git a/carl9170fw/tools/carlu/src/cmd.c b/carl9170fw/tools/carlu/src/cmd.c
deleted file mode 100644
index bb87399..0000000
--- a/carl9170fw/tools/carlu/src/cmd.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * carlu - userspace testing utility for ar9170 devices
- *
- * Abstraction Layer for FW/HW command interface
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include "libusb.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include "carlu.h"
-#include "usb.h"
-#include "debug.h"
-#include "fwcmd.h"
-#include "eeprom.h"
-#include "cmd.h"
-
-int carlu_cmd_echo(struct carlu *ar, const uint32_t message)
-{
-	uint32_t _message;
-	int ret;
-
-	ret = carlusb_cmd(ar, CARL9170_CMD_ECHO,
-			     (uint8_t *)&message, sizeof(message),
-			     (uint8_t *)&_message, sizeof(_message));
-
-	if (ret == 0)
-		ret = (message == _message) ? 0 : -EIO;
-
-	return ret;
-}
-
-struct carl9170_cmd *carlu_cmd_buf(struct carlu *ar,
-	const enum carl9170_cmd_oids cmd, const unsigned int len)
-{
-	struct carl9170_cmd *tmp;
-
-	if (len % 4 || (sizeof(struct carl9170_cmd_head) + len > 64))
-		return ERR_PTR(-EINVAL);
-
-	tmp = malloc(sizeof(struct carl9170_cmd_head) + len);
-	if (tmp) {
-		tmp->hdr.cmd = cmd;
-		tmp->hdr.len = len;
-	}
-	return tmp;
-}
-
-int carlu_cmd_reboot(struct carlu *ar)
-{
-	struct carl9170_cmd *reboot;
-	int err;
-
-	/* sure, we could put the struct on the stack too. */
-	reboot = carlu_cmd_buf(ar, CARL9170_CMD_REBOOT_ASYNC, 0);
-	if (IS_ERR_OR_NULL(reboot))
-		return reboot ? PTR_ERR(reboot) : -ENOMEM;
-
-	err = carlusb_cmd_async(ar, reboot, true);
-	return err;
-}
-
-int carlu_cmd_mem_dump(struct carlu *ar, const uint32_t start,
-			const unsigned int len, void *_buf)
-{
-#define RW	8	/* number of words to read at once */
-#define RB	(sizeof(uint32_t) * RW)
-	uint8_t *buf = _buf;
-	unsigned int i, j, block;
-	int err;
-	__le32 offsets[RW];
-
-	for (i = 0; i < (len + RB - 1) / RB; i++) {
-		block = min_t(unsigned int, (len - RB * i) / sizeof(uint32_t), RW);
-		for (j = 0; j < block; j++)
-			offsets[j] = cpu_to_le32(start + RB * i + 4 * j);
-
-		err = carlusb_cmd(ar, CARL9170_CMD_RREG,
-				    (void *) &offsets, block * sizeof(uint32_t),
-				    (void *) buf + RB * i, RB);
-
-		if (err)
-			return err;
-	}
-
-#undef RW
-#undef RB
-
-	return 0;
-}
-
-int carlu_cmd_mem_watch(struct carlu *ar, const uint32_t mem,
-			const unsigned int len, void *_buf)
-{
-#define RW	8	/* number of words to read at once */
-#define RB	(sizeof(uint32_t) * RW)
-	uint8_t *buf = _buf;
-	unsigned int i, j, block;
-	int err;
-	__le32 offsets[RW];
-
-	for (i = 0; i < (len + RB - 1) / RB; i++) {
-		block = min_t(unsigned int, (len - RB * i) / sizeof(uint32_t), RW);
-		for (j = 0; j < block; j++)
-			offsets[j] = cpu_to_le32(mem);
-
-		err = carlusb_cmd(ar, CARL9170_CMD_RREG,
-				    (void *) &offsets, block * sizeof(uint32_t),
-				    (void *) buf + RB * i, RB);
-
-		if (err)
-			return err;
-	}
-
-#undef RW
-#undef RB
-
-	return 0;
-}
-
-int carlu_cmd_write_mem(struct carlu *ar, const uint32_t addr,
-			const uint32_t val)
-{
-	int err;
-	__le32 msg, block[2] = { cpu_to_le32(addr), cpu_to_le32(val) };
-
-	err = carlusb_cmd(ar, CARL9170_CMD_WREG,
-			  (void *) &block, sizeof(block),
-			  (void *) &msg, sizeof(msg));
-	return err;
-}
-
-int carlu_cmd_read_mem(struct carlu *ar, const uint32_t _addr,
-		       uint32_t *val)
-{
-	int err;
-	__le32 msg, addr = { cpu_to_le32(_addr) };
-	err = carlusb_cmd(ar, CARL9170_CMD_RREG, (void *) &addr, sizeof(addr),
-			  (void *) &msg, sizeof(msg));
-
-	*val = le32_to_cpu(msg);
-	return err;
-}
-
-int carlu_cmd_read_eeprom(struct carlu *ar)
-{
-
-	int err;
-
-	err = carlu_cmd_mem_dump(ar, AR9170_EEPROM_START, sizeof(ar->eeprom),
-				  &ar->eeprom);
-
-#ifndef __CHECKER__
-	/* don't want to handle trailing remains */
-	BUILD_BUG_ON(sizeof(ar->eeprom) % 8);
-#endif
-
-	if (ar->eeprom.length == cpu_to_le16(0xffff))
-		return -ENODATA;
-
-	return 0;
-}
diff --git a/carl9170fw/tools/carlu/src/cmd.h b/carl9170fw/tools/carlu/src/cmd.h
deleted file mode 100644
index ccc9a43..0000000
--- a/carl9170fw/tools/carlu/src/cmd.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * carlu - userspace testing utility for ar9170 devices
- *
- * register/memory/command access functions
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef __CARL9170USER_CMD_H
-#define __CARL9170USER_CMD_H
-
-#include "carlu.h"
-
-int carlu_cmd_echo(struct carlu *ar, const uint32_t message);
-int carlu_cmd_reboot(struct carlu *ar);
-int carlu_cmd_read_eeprom(struct carlu *ar);
-int carlu_cmd_mem_dump(struct carlu *ar, const uint32_t start,
-			const unsigned int len, void *_buf);
-int carlu_cmd_write_mem(struct carlu *ar, const uint32_t addr,
-			const uint32_t val);
-int carlu_cmd_mem_watch(struct carlu *ar, const uint32_t mem,
-			const unsigned int len, void *_buf);
-
-struct carl9170_cmd *carlu_cmd_buf(struct carlu *ar,
-	const enum carl9170_cmd_oids cmd, const unsigned int len);
-
-#define PAYLOAD_MAX	(CARL9170_MAX_CMD_LEN / 4 - 1)
-/*
- * Macros to facilitate writing multiple registers in a single
- * write-combining USB command. Note that when the first group
- * fails the whole thing will fail without any others attempted,
- * but you won't know which write in the group failed.
- */
-#define carlu_regwrite_begin(ar)					\
-do {									\
-	struct carlu *__ar = ar;					\
-	unsigned int __nreg = 0;					\
-	int __err = 0;							\
-	uint32_t __dummy;
-
-#define carlu_regwrite_flush()						\
-	if (__nreg) {							\
-		__err = carlusb_cmd(__ar, CARL9170_CMD_WREG,		\
-			(u8 *)&__ar->cmd.cmd.data, 8 * __nreg,		\
-			(u8 *)&__dummy, sizeof(__dummy));		\
-		__nreg = 0;						\
-		if (__err)						\
-			goto __regwrite_out;				\
-	}
-
-#define carlu_regwrite(r, v) do {					\
-	__ar->cmd.buf4[2 * __nreg + 1] = cpu_to_le32(r);		\
-	__ar->cmd.buf4[2 * __nreg + 2] = cpu_to_le32(v);		\
-	__nreg++;							\
-	if ((__nreg >= PAYLOAD_MAX / 2)) {				\
-		__err = carlusb_cmd(__ar, CARL9170_CMD_WREG,		\
-			(u8 *)&__ar->cmd.cmd.data, 8 * __nreg,		\
-			(u8 *)&__dummy, sizeof(__dummy));		\
-									\
-		__nreg = 0;						\
-		if (__err)						\
-			goto __regwrite_out;				\
-	}								\
-} while (0)
-
-#define carlu_regwrite_finish()						\
-__regwrite_out :							\
-	if (__err == 0 && __nreg)					\
-		carlu_regwrite_flush();
-
-#define carlu_regwrite_result()						\
-	__err;								\
-} while (0);
-
-
-#define carlu_async_get_buf()						\
-do {									\
-	__cmd = carlu_cmd_buf(__carl, CARL9170_CMD_WREG_ASYNC,		\
-				 CARL9170_MAX_CMD_PAYLOAD_LEN);		\
-	if (IS_ERR_OR_NULL(__cmd)) {					\
-		__err = __cmd ? PTR_ERR(__cmd) : -ENOMEM;		\
-		goto __async_regwrite_out;				\
-	}								\
-} while (0);
-
-#define carlu_async_regwrite_begin(carl)				\
-do {									\
-	int __nreg = 0, __err = 0;					\
-	struct carlu *__carl = carl;					\
-	struct carl9170_cmd *__cmd;					\
-	carlu_async_get_buf();						\
-
-#define carlu_async_regwrite_flush()					\
-	if (__nreg) {							\
-		__cmd->hdr.len = 8 * __nreg;				\
-		__err = carlusb_cmd_async(__carl, __cmd, true);		\
-		__nreg = 0;						\
-		if (__err)						\
-			goto __async_regwrite_out;			\
-		__cmd = NULL;						\
-		carlu_async_get_buf();					\
-	}
-
-#define carlu_async_regwrite(r, v) do {					\
-	__cmd->wreg.regs[__nreg].addr = cpu_to_le32(r);			\
-	__cmd->wreg.regs[__nreg].val = cpu_to_le32(v);			\
-	__nreg++;							\
-	if ((__nreg >= PAYLOAD_MAX / 2))				\
-		carlu_async_regwrite_flush();				\
-} while (0)
-
-#define carlu_async_regwrite_finish()					\
-__async_regwrite_out :							\
-	if (__err == 0 && __nreg)					\
-		carlu_async_regwrite_flush();
-
-#define carlu_async_regwrite_result()					\
-	__err;								\
-} while (0);
-
-#endif /* __CARL9170USER_CMD_H */
diff --git a/carl9170fw/tools/carlu/src/debug.c b/carl9170fw/tools/carlu/src/debug.c
deleted file mode 100644
index f8d6372..0000000
--- a/carl9170fw/tools/carlu/src/debug.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * carlu - userspace testing utility for ar9170 devices
- *
- * Random assortment of debug stuff
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include "debug.h"
-
-bool print_message_debug_level;
-enum debug_level_t debug_level;
-FILE *_stdout;
-FILE *_stddbg;
-FILE *_stderr;
-
-void init_debug()
-{
-	debug_level = VERBOSE;
-	debug_level = INFO;
-	print_message_debug_level = false;
-
-	_stdout = stdout;
-	_stddbg = stdout;
-	_stderr = stderr;
-}
-
-FILE *dbg_lvl_to_fh(const enum debug_level_t lvl)
-{
-	switch (lvl) {
-	case ERROR:
-	case WARNING:
-		return _stderr;
-	case INFO:
-		return _stdout;
-	case VERBOSE:
-		return _stddbg;
-	default:
-		BUG_ON(1);
-	}
-}
-
-void print_hex_dump_bytes(const enum debug_level_t lvl, const char *pre,
-			  const void *buf, size_t len)
-{
-	char line[58];
-	char str[17] = { 0 };
-	const unsigned char *tmp = (void *) buf;
-	char *pbuf = line;
-	size_t i, j;
-
-	for (i = 0; i < len; i++) {
-		if (i % 16 == 0) {
-			if (pbuf != line) {
-				__fprintf(lvl, "%s%s: %s\n", pre, line, str);
-				pbuf = line;
-			}
-
-			pbuf += sprintf(pbuf, "0x%04lx: ", (unsigned long)i);
-		}
-
-		pbuf += sprintf(pbuf, "%.2x ", tmp[i]);
-		str[i % 16] = (isprint(tmp[i]) && isascii(tmp[i])) ? tmp[i] : '.';
-	}
-	if (pbuf != line) {
-		if ((i % 16)) {
-			str[i % 16] = '\0';
-
-			for (j = 0; j < (16 - (i % 16)); j++)
-				pbuf += sprintf(pbuf, "   ");
-		}
-
-		__fprintf(lvl, "%s%s: %s\n", pre, line, str);
-	}
-}
diff --git a/carl9170fw/tools/carlu/src/debug.h b/carl9170fw/tools/carlu/src/debug.h
deleted file mode 100644
index 5c78056..0000000
--- a/carl9170fw/tools/carlu/src/debug.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * carlu - userspace testing utility for ar9170 devices
- *
- * Debug API definition
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef __CARL9170USER_DEBUG_H
-#define __CARL9170USER_DEBUG_H
-
-#include <stdio.h>
-#include "compiler.h"
-
-enum debug_level_t {
-	SILENT,
-	ERROR,
-	WARNING,
-	INFO,
-	VERBOSE,
-
-	/* KEEP LAST */
-	ALL,
-};
-
-extern bool print_message_debug_level;
-extern enum debug_level_t debug_level;
-
-#define __fprintf(lvl, fmt, args...)		do {						\
-		if (lvl <= debug_level) {							\
-			if (print_message_debug_level)						\
-				fprintf(dbg_lvl_to_fh(lvl), "<%d>:" fmt, lvl, ##args);		\
-			else									\
-				fprintf(dbg_lvl_to_fh(lvl), fmt, ##args);			\
-		}										\
-	} while (0);
-
-#define dbg(fmt, args...) __fprintf(VERBOSE, fmt, ##args)
-#define info(fmt, args...) __fprintf(INFO, fmt, ##args)
-#define warn(fmt, args...) __fprintf(WARNING, fmt, ##args)
-#define err(fmt, args...) __fprintf(ERROR, fmt, ##args)
-
-#define BUG_ON(a)										\
-	do {											\
-		if (a) {									\
-			__fprintf(ERROR, "!!!=>BUG IN function \"%s\" at line %d<=!!! %s\n",	\
-				 __func__, __LINE__, #a);					\
-			fflush(stderr);								\
-			abort();								\
-		}										\
-	} while (0)
-
-FILE *dbg_lvl_to_fh(const enum debug_level_t lvl);
-void init_debug(void);
-void print_hex_dump_bytes(const enum debug_level_t lvl, const char *prefix,
-			  const void *buf, size_t len);
-
-#endif /* __CARL9170USER_DEBUG_H */
diff --git a/carl9170fw/tools/carlu/src/fw.c b/carl9170fw/tools/carlu/src/fw.c
deleted file mode 100644
index fa4b388..0000000
--- a/carl9170fw/tools/carlu/src/fw.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * carlu - userspace testing utility for ar9170 devices
- *
- * Firmware parsers
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include "libusb.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include "carlu.h"
-#include "usb.h"
-#include "debug.h"
-
-int carlu_fw_check(struct carlu *ar)
-{
-	struct carl9170fw_otus_desc *otus_desc;
-
-	otus_desc = carlfw_find_desc(ar->fw, (uint8_t *) OTUS_MAGIC,
-				     sizeof(*otus_desc),
-				     CARL9170FW_OTUS_DESC_CUR_VER);
-
-	if (!otus_desc) {
-		err("No valid OTUS descriptor found.\n");
-		return -EINVAL;
-	}
-
-	if (!carl9170fw_supports(otus_desc->feature_set, CARL9170FW_DUMMY_FEATURE)) {
-		err("Invalid Firmware Descriptor.\n");
-		return -EIO;
-	}
-
-	if (carl9170fw_supports(otus_desc->feature_set, CARL9170FW_UNUSABLE))
-		dbg("Firmware is marked as unuseable.\n");
-
-	info("Firmware Version: %d.\n", otus_desc->api_ver);
-
-	return 0;
-}
-
-int carlusb_fw_check(struct carlu *ar)
-{
-	struct carl9170fw_otus_desc *otus_desc;
-
-	otus_desc = carlfw_find_desc(ar->fw, (uint8_t *) OTUS_MAGIC,
-				     sizeof(*otus_desc),
-				     CARL9170FW_OTUS_DESC_CUR_VER);
-
-	if (!otus_desc) {
-		err("No valid USB descriptor found.\n");
-		return -ENODATA;
-	}
-
-	if (!carl9170fw_supports(otus_desc->feature_set, CARL9170FW_DUMMY_FEATURE)) {
-		err("Invalid Firmware Descriptor.\n");
-		return -EINVAL;
-	}
-
-	if (!carl9170fw_supports(otus_desc->feature_set, CARL9170FW_USB_INIT_FIRMWARE)) {
-		err("Firmware does not know how to initialize USB core.\n");
-		return -EOPNOTSUPP;
-	}
-
-	if (carl9170fw_supports(otus_desc->feature_set, CARL9170FW_USB_DOWN_STREAM)) {
-		dbg("Enabled tx stream mode.\n");
-		ar->tx_stream = true;
-		ar->extra_headroom = sizeof(struct ar9170_stream);
-	}
-
-	if (carl9170fw_supports(otus_desc->feature_set, CARL9170FW_USB_UP_STREAM)) {
-		dbg("Enabled rx stream mode.\n");
-		ar->rx_stream = true;
-	}
-
-	if (carl9170fw_supports(otus_desc->feature_set, CARL9170FW_USB_RESP_EP2))
-		dbg("Firmware sends traps over EP2.\n");
-
-	ar->dma_chunk_size = le16_to_cpu(otus_desc->tx_frag_len);
-	ar->dma_chunks = otus_desc->tx_descs;
-	ar->rx_max = le16_to_cpu(otus_desc->rx_max_frame_len);
-
-	if (carl9170fw_supports(otus_desc->feature_set, CARL9170FW_MINIBOOT))
-		ar->miniboot_size = le16_to_cpu(otus_desc->miniboot_size);
-
-	return 0;
-}
-
-void carlu_fw_info(struct carlu *ar)
-{
-	struct carl9170fw_motd_desc *motd_desc;
-	unsigned int fw_date;
-
-	motd_desc = carlfw_find_desc(ar->fw, (uint8_t *) MOTD_MAGIC,
-				     sizeof(*motd_desc),
-				     CARL9170FW_MOTD_DESC_CUR_VER);
-
-	if (motd_desc) {
-		fw_date = le32_to_cpu(motd_desc->fw_year_month_day);
-
-		info("Firmware Date: 2%.3d-%.2d-%.2d\n",
-		     CARL9170FW_GET_YEAR(fw_date), CARL9170FW_GET_MONTH(fw_date),
-		     CARL9170FW_GET_DAY(fw_date));
-	}
-}
diff --git a/carl9170fw/tools/carlu/src/main.c b/carl9170fw/tools/carlu/src/main.c
deleted file mode 100644
index c1b3277..0000000
--- a/carl9170fw/tools/carlu/src/main.c
+++ /dev/null
@@ -1,307 +0,0 @@
-/*
- * carlu - userspace testing utility for ar9170 devices
- *
- * main program routine
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include "SDL.h"
-#include <SDL_version.h>
-
-#include "debug.h"
-#include "carlu.h"
-#include "usb.h"
-#include "frame.h"
-#include "test.h"
-#include "cmd.h"
-
-void *carlu_alloc_driver(size_t size)
-{
-	unsigned int i;
-	struct carlu *ar;
-
-	if (size < sizeof(*ar)) {
-		err("bogus driver context request.");
-		return NULL;
-	}
-
-	ar = malloc(size);
-	if (ar == NULL) {
-		err("failed to alloc driver context.");
-		return NULL;
-	}
-	memset(ar, 0, size);
-
-	for (i = 0; i < __AR9170_NUM_TXQ; i++)
-		frame_queue_init(&ar->tx_sent_queue[i]);
-	ar->resp_lock = SDL_CreateMutex();
-	ar->mem_lock = SDL_CreateMutex();
-	ar->resp_pend = SDL_CreateCond();
-	ar->tx_pending = 0;
-	return ar;
-}
-
-void carlu_free_driver(struct carlu *ar)
-{
-	unsigned int i;
-
-	dbg("destroy driver struct.\n");
-	SDL_DestroyMutex(ar->resp_lock);
-	SDL_DestroyMutex(ar->mem_lock);
-	SDL_DestroyCond(ar->resp_pend);
-
-	for (i = 0; i < __AR9170_NUM_TXQ; i++)
-		frame_queue_kill(&ar->tx_sent_queue[i]);
-
-	free(ar);
-}
-
-static int carlu_init()
-{
-	struct SDL_version compiled;
-	int ret;
-
-	SDL_VERSION(&compiled);
-	dbg("=== SDL %d.%d.%d ===\n", compiled.major, compiled.minor, compiled.patch);
-
-	ret = SDL_Init(SDL_INIT_TIMER);
-	if (ret != 0) {
-		err("Unable to initialize SDL: (%s)\n", SDL_GetError());
-		return EXIT_FAILURE;
-	}
-
-	return usb_init();
-}
-
-static void carlu_exit()
-{
-	SDL_Quit();
-	usb_exit();
-}
-
-static int carlu_dump_eeprom(void)
-{
-	struct carlu *carl = NULL;
-	uint8_t data[8192] = { 0 };
-	int err;
-
-	err = carlu_init();
-	if (err)
-		goto out;
-
-	carl = carlusb_probe();
-	if (IS_ERR_OR_NULL(carl)) {
-		err = PTR_ERR(carl);
-		goto out;
-	}
-
-	err = carlu_cmd_mem_dump(carl, 0, sizeof(data), &data);
-	if (err)
-		goto out_close;
-
-	print_hex_dump_bytes(INFO, "EEPROM:", data, sizeof(data));
-
-out_close:
-	carlusb_close(carl);
-
-out:
-	carlu_exit();
-	return err ? EXIT_FAILURE : EXIT_SUCCESS;
-}
-
-static int carlu_run_gpio_test(void)
-{
-	struct carlu *carl = NULL;
-	int err;
-
-	err = carlu_init();
-	if (err)
-		goto out;
-
-	carl = carlusb_probe();
-	if (IS_ERR_OR_NULL(carl)) {
-		err = PTR_ERR(carl);
-		goto out;
-	}
-
-	err = carlu_gpio_test(carl);
-	if (err)
-		goto out_close;
-
-out_close:
-	carlusb_close(carl);
-
-out:
-	carlu_exit();
-	return err ? EXIT_FAILURE : EXIT_SUCCESS;
-}
-
-static int carlu_run_random_test(void)
-{
-	struct carlu *carl = NULL;
-	int err;
-
-	err = carlu_init();
-	if (err)
-		goto out;
-
-	carl = carlusb_probe();
-	if (IS_ERR_OR_NULL(carl)) {
-		err = PTR_ERR(carl);
-		goto out;
-	}
-
-	err = carlu_random_test(carl);
-	if (err)
-		goto out_close;
-
-out_close:
-	carlusb_close(carl);
-
-out:
-	carlu_exit();
-	return err ? EXIT_FAILURE : EXIT_SUCCESS;
-}
-
-static int carlu_run_loop_test(void)
-{
-	struct carlu *carl;
-	int err;
-
-	err = carlu_init();
-	if (err)
-		return EXIT_FAILURE;
-
-	carl = carlusb_probe();
-	if (IS_ERR_OR_NULL(carl)) {
-		err = PTR_ERR(carl);
-		goto out;
-	}
-
-	carlu_cmd_write_mem(carl, AR9170_MAC_REG_BCN_PERIOD, 0xFFFFFFFF);
-	carlu_cmd_write_mem(carl, AR9170_MAC_REG_PRETBTT, 0xFFFFFFFF);
-
-	/* different payload test */
-	carlu_loopback_test(carl, 9000, 1000, 1566, 1566);
-	carlusb_close(carl);
-
-out:
-	return err ? EXIT_FAILURE : EXIT_SUCCESS;
-}
-
-static int carlu_probe_all(void)
-{
-	struct carlu *carl[32] = { 0 };
-	unsigned int devs;
-	int ret;
-
-	ret = carlu_init();
-	if (ret)
-		return EXIT_FAILURE;
-
-	for (devs = 0; devs < ARRAY_SIZE(carl); devs++) {
-		carl[devs] = carlusb_probe();
-		if (IS_ERR_OR_NULL(carl[devs]))
-			break;
-	}
-
-	info("Found %d devices\n", devs);
-
-	for (; devs > 0; devs--)
-		carlusb_close(carl[devs - 1]);
-
-	carlu_exit();
-	return EXIT_SUCCESS;
-}
-
-struct menu_struct {
-	char option;
-	unsigned int parameters;
-	int (*function)(void);
-	char help_text[80];
-};
-
-#define MENU_ITEM(op, func, helpme)	\
-	{				\
-		.option = op,		\
-		.parameters = 0,	\
-		.function = func,	\
-		.help_text = helpme,	\
-	}
-
-static int show_help(void);
-
-static const struct menu_struct menu[] = {
-	[0] = MENU_ITEM('h', show_help, "shows this useless help message text."),	/* keep this entry at 0! */
-	      MENU_ITEM('e', carlu_dump_eeprom, "hexdumps eeprom content to stdout."),
-	      MENU_ITEM('l', carlusb_print_known_devices, "list of all known ar9170 usb devices."),
-	      MENU_ITEM('p', carlu_probe_all, "probe all possible devices."),
-	      MENU_ITEM('t', carlu_run_loop_test, "run tx/rx test."),
-	      MENU_ITEM('g', carlu_run_gpio_test, "flash the leds."),
-	      MENU_ITEM('r', carlu_run_random_test, "get random numbers."),
-};
-
-static int show_help(void)
-{
-	unsigned int i;
-	char parameters[ARRAY_SIZE(menu) + 1];
-
-	for (i = 0; i < ARRAY_SIZE(menu); i++)
-		parameters[i] = menu[i].option;
-
-	parameters[ARRAY_SIZE(menu)] = '\0';
-
-	info("usage: ar9170user -[%s]\n", parameters);
-
-	for (i = 0; i < ARRAY_SIZE(menu); i++)
-		info("\t-%c\t%s\n", menu[i].option, menu[i].help_text);
-
-	return EXIT_FAILURE;
-}
-
-static int select_menu_item(const char arg)
-{
-	unsigned int i;
-
-	for (i = ARRAY_SIZE(menu) - 1; i != 0; i--) {
-		if (arg == menu[i].option)
-			break;
-	}
-
-	return menu[i].function();
-}
-
-int main(int argc, char *argv[])
-{
-	init_debug();
-
-	if (argc != 2 || strlen(argv[1]) != 2 || argv[1][0] != '-')
-		return show_help();
-
-	return select_menu_item(argv[1][1]);
-}
diff --git a/carl9170fw/tools/carlu/src/rx.c b/carl9170fw/tools/carlu/src/rx.c
deleted file mode 100644
index 2a77334..0000000
--- a/carl9170fw/tools/carlu/src/rx.c
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * carlu - userspace testing utility for ar9170 devices
- *
- * RX data processing
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include "libusb.h"
-
-#include "carlu.h"
-#include "debug.h"
-#include "frame.h"
-#include "ieee80211.h"
-#include "wlan.h"
-
-static void carlu_handle_data(struct carlu *ar, void *buf,
-			       unsigned int len)
-{
-	if (ar->rx_cb) {
-		ar->rx_cb(ar, buf, len);
-	} else {
-		dbg("unhandled data:\n");
-		print_hex_dump_bytes(VERBOSE, "DATA:", buf, len);
-	}
-}
-
-void carlu_handle_command(struct carlu *ar, void *buf,
-			  unsigned int len)
-{
-	struct carl9170_rsp *cmd;
-	int ret = 0;
-
-	cmd = (void *) buf;
-
-	if ((cmd->hdr.cmd & CARL9170_RSP_FLAG) != CARL9170_RSP_FLAG) {
-		if ((cmd->hdr.cmd & CARL9170_CMD_ASYNC_FLAG))
-			return;
-
-		SDL_mutexP(ar->resp_lock);
-		if (ar->resp_buf && ar->resp_len && ar->resp_len >= (len - 4)) {
-			memcpy(ar->resp_buf, buf + 4, len - 4);
-			ar->resp_buf = NULL;
-		} else {
-			warn("spurious command response (%d / %d)\n",
-			     (int) len - 4, (int) ar->resp_len);
-			print_hex_dump_bytes(WARNING, "RSP:", buf, len);
-		}
-		SDL_mutexV(ar->resp_lock);
-
-		SDL_CondSignal(ar->resp_pend);
-		return;
-	}
-
-	if (ar->cmd_cb)
-		ret = ar->cmd_cb(ar, cmd, buf, len);
-
-	if (ret) {
-		switch (cmd->hdr.cmd) {
-		case CARL9170_RSP_TXCOMP:
-			carlu_tx_feedback(ar, cmd);
-			break;
-
-		case CARL9170_RSP_TEXT:
-			info("carl9170 FW: %.*s\n", (int)len - 4, (char *)buf + 4);
-			break;
-
-		case CARL9170_RSP_HEXDUMP:
-			info("carl9170 FW: hexdump\n");
-			print_hex_dump_bytes(INFO, "HEX:", (char *)buf + 4, len - 4);
-			break;
-
-		case CARL9170_RSP_WATCHDOG:
-			err("Woof Woof! Watchdog notification.\n");
-			break;
-
-		case CARL9170_RSP_GPIO:
-			info("GPIO Interrupt => GPIO state %.8x\n",
-			    le32_to_cpu(cmd->gpio.gpio));
-			break;
-
-		case CARL9170_RSP_RADAR:
-			info("RADAR Interrupt");
-			break;
-
-		default:
-			warn("received unhandled event 0x%x\n", cmd->hdr.cmd);
-			print_hex_dump_bytes(WARNING, "RSP:", (char *)buf + 4, len - 4);
-			break;
-		}
-	}
-}
-
-static void __carlu_rx(struct carlu *ar, uint8_t *buf, unsigned int len)
-{
-	unsigned int i;
-
-	i = 0;
-
-	/* weird thing, but this is the same in the original driver */
-	while (len > 2 && i < 12 && buf[0] == 0xff && buf[1] == 0xff) {
-		i += 2;
-		len -= 2;
-		buf += 2;
-	}
-
-	if (i == 12) {
-		struct carl9170_rsp *cmd;
-		i = 0;
-
-		while (i < len) {
-			cmd = (void *) &buf[i];
-
-			carlu_handle_command(ar, cmd, cmd->hdr.len + 4);
-			i += cmd->hdr.len + 4;
-		}
-	} else {
-		carlu_handle_data(ar, buf, len);
-	}
-}
-
-static void carlu_rx_stream(struct carlu *ar, struct frame *frame)
-{
-	void *buf = frame->data;
-	unsigned int len = frame->len;
-
-	while (len >= 4) {
-		struct ar9170_stream *rx_stream;
-		unsigned int resplen, elen;
-
-		rx_stream = (void *) buf;
-		resplen = le16_to_cpu(rx_stream->length);
-		elen = roundup(resplen + 4, 4);
-
-		if (rx_stream->tag != cpu_to_le16(0x4e00)) {
-			warn("frame has no tag %p %u %x.\n",
-			      buf, (int) len, rx_stream->tag);
-			print_hex_dump_bytes(WARNING, "FRAME:", frame->data, frame->len);
-
-			__carlu_rx(ar, buf, len);
-			return;
-		}
-
-		__carlu_rx(ar, rx_stream->payload, resplen);
-
-		len -= elen;
-		buf += elen;
-	}
-}
-
-void carlu_rx(struct carlu *ar, struct frame *frame)
-{
-	if (ar->rx_stream)
-		carlu_rx_stream(ar, frame);
-	else
-		__carlu_rx(ar, frame->data, frame->len);
-}
diff --git a/carl9170fw/tools/carlu/src/test.c b/carl9170fw/tools/carlu/src/test.c
deleted file mode 100644
index bf49559..0000000
--- a/carl9170fw/tools/carlu/src/test.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * carlu - userspace testing utility for ar9170 devices
- *
- * Various tests
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include "libusb.h"
-#include "SDL.h"
-
-#include "carlu.h"
-#include "debug.h"
-#include "frame.h"
-#include "usb.h"
-#include "cmd.h"
-
-void debug_test(void)
-{
-	err("This is an error.\n");
-	warn("This is a warnig.\n");
-	info("This is an informative message.\n");
-	dbg("This is just utter useless babble.\n");
-}
-
-void carlu_frame_test(struct carlu *ar)
-{
-	struct frame *frame;
-
-	frame = carlu_alloc_frame(ar, 0x40);
-	frame_reserve(frame, 0x10);
-
-	memset(frame_put(frame, 0x10), 0x11, 0x10);
-	memset(frame_put(frame, 0x10), 0x22, 0x10);
-	memset(frame_push(frame, 0x10), 0x33, 0x10);
-	memset(frame_put(frame, 0x10), 0x44, 0x10);
-
-	print_hex_dump_bytes(INFO, "DATA:", frame->data, frame->len);
-
-	print_hex_dump_bytes(INFO, "PAYLOAD:", frame->payload, frame->alloced);
-
-	frame_free(frame);
-}
-
-static void carlu_loopback_tx_cb(struct carlu *ar __unused,
-				    struct frame *frame __unused)
-{
-}
-
-static int carlu_loopback_cmd(struct carlu *ar __unused,
-			      struct carl9170_rsp *cmd, void *buf __unused,
-			      unsigned int len __unused)
-{
-	unsigned int i, n;
-
-	switch (cmd->hdr.cmd) {
-	case CARL9170_RSP_TXCOMP:
-		n = cmd->hdr.ext;
-		dbg("received tx feedback (%d).\n", n);
-
-		for (i = 0; i < n; i++) {
-			dbg("cookie:%x info:%x\n",
-				cmd->_tx_status[i].cookie,
-				cmd->_tx_status[i].info);
-		}
-		return -1;
-
-	default:
-		return -1;
-	}
-}
-
-static void carlu_loopback_rx(struct carlu *ar,
-				void *buf __unused, unsigned int len)
-{
-	ar->rxed++;
-	ar->rx_octets += len;
-}
-
-static void carlu_loopback_mark_tx_frames(struct frame *frame)
-{
-	unsigned int i;
-
-	for (i = 0; i < frame->len; i++)
-		frame->data[i] = (uint8_t) i;
-}
-
-void carlu_loopback_test(struct carlu *ar, const unsigned int total_runs,
-			  const unsigned int interval, const unsigned int min_len, const unsigned int max_len)
-{
-	struct frame *frame;
-	uint32_t start_time, total_time = 0;
-	float moctets, dtime;
-	unsigned int runs = 0, i = 0, j = 0, len;
-	int ret;
-
-	if (min_len > max_len) {
-		err("stresstest: invalid parameters => min_len:%d > max_len:%d",
-		    min_len, max_len);
-		return;
-	}
-
-	if (min_len < 4) {
-		err("stresstest: invalid parameters => min_len is smaller than 4");
-		return;
-	}
-
-	len = min_len;
-	frame = carlu_alloc_frame(ar, len);
-	frame_put(frame, len);
-
-	carlu_loopback_mark_tx_frames(frame);
-
-	ar->rx_cb = carlu_loopback_rx;
-	ar->cmd_cb = carlu_loopback_cmd;
-	ar->tx_cb = carlu_loopback_tx_cb;
-
-	start_time = SDL_GetTicks();
-	while (runs <= total_runs) {
-		if (frame && carlu_tx(ar, frame) == 0) {
-			len = min_len;
-			i++;
-		} else {
-			frame_free(frame);
-		}
-
-		frame = NULL;
-
-		frame = carlu_alloc_frame(ar, len);
-		frame_put(frame, len);
-
-		carlu_loopback_mark_tx_frames(frame);
-		j++;
-
-		total_time = SDL_GetTicks() - start_time;
-
-		if (total_time >= interval) {
-			moctets = ((float)ar->tx_octets) / (1024.0f * 1024.0f);
-			dtime = ((float)total_time) / 1000;
-			info("%d: tx %d of %d => %.2f MiB in %.2f secs => %.4f MBits/s\n",
-				runs, i, j, moctets, dtime, (moctets * 8.0f) / dtime);
-
-			moctets = ((float)ar->rx_octets) / (1024.0f * 1024.0f);
-			info("%d: rx %d of %d => %.2f MiB in %.2f secs => %.4f MBits/s\n",
-				runs, ar->rxed, i, moctets, dtime, (moctets * 8.0f) / dtime);
-
-			if ((ar->rxed == 0 && i) || !i) {
-				ret = carlu_cmd_echo(ar, 0xdeadbeef);
-				if (ret)
-					warn("firmware crashed... echo_cmd: (%d)\n", ret);
-			}
-
-			total_time = 0;
-			i = 0;
-			j = 0;
-			ar->rxed = 0;
-			ar->txed = 0;
-			ar->rx_octets = 0;
-			ar->tx_octets = 0;
-			runs++;
-			start_time = SDL_GetTicks();
-		}
-	}
-
-	ar->rx_cb = NULL;
-	ar->cmd_cb = NULL;
-	ar->tx_cb = NULL;
-}
-
-int carlu_gpio_test(struct carlu *ar)
-{
-	uint32_t gpio;
-
-#define CHK(cmd)				\
-	do {					\
-		int __err = cmd;		\
-		if ((__err))			\
-			return __err;		\
-	} while (0)
-
-	CHK(carlu_cmd_read_mem(ar, AR9170_GPIO_REG_PORT_DATA, &gpio));
-	info("GPIO state:%x\n", gpio);
-
-	/* turn both LEDs on */
-	CHK(carlu_cmd_write_mem(ar, AR9170_GPIO_REG_PORT_DATA,
-	    AR9170_GPIO_PORT_LED_0 | AR9170_GPIO_PORT_LED_1));
-
-	SDL_Delay(700);
-
-	CHK(carlu_cmd_read_mem(ar, AR9170_GPIO_REG_PORT_DATA, &gpio));
-	info("GPIO state:%x\n", gpio);
-
-	/* turn LEDs off everything */
-	CHK(carlu_cmd_write_mem(ar, AR9170_GPIO_REG_PORT_DATA, 0));
-
-	CHK(carlu_cmd_read_mem(ar, AR9170_GPIO_REG_PORT_DATA, &gpio));
-	info("GPIO state:%x\n", gpio);
-}
-
-int carlu_random_test(struct carlu *ar)
-{
-	uint32_t buf[4096];
-	int err, i;
-
-	err = carlu_cmd_mem_watch(ar, AR9170_RAND_REG_NUM, sizeof(buf), buf);
-	if (err)
-		return err;
-
-	for (i = 0; i < ARRAY_SIZE(buf); i++)
-		info("%.2x %.2x ", buf[i] & 0xff, buf[i] >> 8);
-
-	info("\n");
-}
diff --git a/carl9170fw/tools/carlu/src/test.h b/carl9170fw/tools/carlu/src/test.h
deleted file mode 100644
index 373ba08..0000000
--- a/carl9170fw/tools/carlu/src/test.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * carlu - userspace testing utility for ar9170 devices
- *
- * test.c header
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef __CARL9170USER_TEST_H
-#define __CARL9170USER_TEST_H
-
-#include "carlu.h"
-
-void carlu_loopback_test(struct carlu *ar, const unsigned int total_runs,
-			 const unsigned int interval, const unsigned int min_len,
-			 const unsigned int max_len);
-
-int carlu_gpio_test(struct carlu *ar);
-int carlu_random_test(struct carlu *ar);
-
-#endif /* __CARL9170USER_TEST_H */
diff --git a/carl9170fw/tools/carlu/src/tx.c b/carl9170fw/tools/carlu/src/tx.c
deleted file mode 100644
index ec97502..0000000
--- a/carl9170fw/tools/carlu/src/tx.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/*
- * carlu - userspace testing utility for ar9170 devices
- *
- * xmit - related functions
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-#include "libusb.h"
-
-#include "carlu.h"
-#include "debug.h"
-#include "frame.h"
-#include "usb.h"
-#include "ieee80211.h"
-#include "wlan.h"
-
-struct frame *carlu_alloc_frame(struct carlu *ar, unsigned int size)
-{
-	struct frame *tmp;
-	unsigned int total_len;
-
-	total_len = ar->extra_headroom + sizeof(struct _carl9170_tx_superframe) + size;
-
-	tmp = frame_alloc(total_len);
-	if (!tmp)
-		return NULL;
-
-	frame_reserve(tmp, sizeof(struct _carl9170_tx_superframe) + ar->extra_headroom);
-
-	tmp->queue = 2;
-
-	return tmp;
-}
-
-static int carlu_alloc_dev_mem(struct carlu *ar,
-				struct frame *frame)
-{
-	struct _carl9170_tx_superframe *txp = (void *)frame->data;
-	unsigned int len, chunks;
-
-	len = roundup(frame->len, ar->dma_chunk_size);
-	chunks = len / ar->dma_chunk_size;
-
-	SDL_mutexP(ar->mem_lock);
-	if (ar->tx_pending >= ar->dma_chunks ||
-	    ar->used_dma_chunks + chunks >= ar->dma_chunks) {
-		SDL_mutexV(ar->mem_lock);
-		return -ENOSPC;
-	}
-
-	ar->used_dma_chunks += chunks;
-	ar->tx_pending++;
-	txp->s.cookie = ar->cookie++;
-	SDL_mutexV(ar->mem_lock);
-
-	return 0;
-}
-
-static void carlu_free_dev_mem(struct carlu *ar,
-				 struct frame *frame)
-{
-	struct _carl9170_tx_superframe *txp = (void *)frame->data;
-	unsigned int len, chunks;
-
-	len = roundup(frame->len, ar->dma_chunk_size);
-	chunks = len / ar->dma_chunk_size;
-
-	SDL_mutexP(ar->mem_lock);
-	ar->used_dma_chunks -= chunks;
-	ar->tx_pending--;
-	SDL_mutexV(ar->mem_lock);
-}
-
-void carlu_free_frame(struct carlu *ar __unused,
-			 struct frame *frame)
-{
-	frame_free(frame);
-}
-
-static struct frame *carlu_find_frame(struct carlu *ar,
-					 unsigned int queue, uint8_t cookie)
-{
-	struct frame *frame = NULL;
-
-	BUG_ON(queue >= __AR9170_NUM_TXQ);
-	BUG_ON(SDL_mutexP(ar->tx_sent_queue[queue].lock) != 0);
-	FRAME_WALK(frame, &ar->tx_sent_queue[queue]) {
-		struct _carl9170_tx_superframe *super;
-
-		super = (void *) frame->data;
-		if (super->s.cookie == cookie) {
-			__frame_unlink(&ar->tx_sent_queue[queue], frame);
-			SDL_mutexV(ar->tx_sent_queue[queue].lock);
-			return frame;
-		}
-	}
-	SDL_mutexV(ar->tx_sent_queue[queue].lock);
-
-	return NULL;
-}
-
-static void carlu_tx_fb_cb(struct carlu *ar,
-			      struct frame *frame)
-{
-	if (ar->tx_fb_cb)
-		ar->tx_fb_cb(ar, frame);
-	else
-		carlu_free_frame(ar, frame);
-
-}
-
-void carlu_tx_feedback(struct carlu *ar,
-		       struct carl9170_rsp *cmd)
-{
-	unsigned int i, n, k, q;
-	struct frame *frame;
-	struct carlu_tx_info *tx_info;
-
-	n = cmd->hdr.ext;
-
-	for (i = 0; i < n; i++) {
-		q = (cmd->_tx_status[i].info >> CARL9170_TX_STATUS_QUEUE_S) &
-		    CARL9170_TX_STATUS_QUEUE;
-		frame = carlu_find_frame(ar, q, cmd->_tx_status[i].cookie);
-		if (frame) {
-			carlu_free_dev_mem(ar, frame);
-			tx_info = get_tx_info(frame);
-
-			k = (cmd->_tx_status[i].info >> CARL9170_TX_STATUS_RIX)
-			    & CARL9170_TX_STATUS_RIX_S;
-			tx_info->rates[k].cnt = (cmd->_tx_status[i].info >>
-						 CARL9170_TX_STATUS_TRIES_S) &
-						CARL9170_TX_STATUS_TRIES;
-			for (k++; k < CARL9170_TX_MAX_RATES; k++) {
-				tx_info->rates[k].rix = -1;
-				tx_info->rates[k].cnt = -1;
-			}
-
-			carlu_tx_fb_cb(ar, frame);
-		} else {
-			err("Found no frame for cookie %d.\n",
-			    cmd->_tx_status[i].cookie);
-		}
-	}
-}
-
-int carlu_tx(struct carlu *ar, struct frame *frame)
-{
-	struct _carl9170_tx_superframe *txp;
-	unsigned int len, queue;
-	int cookie, err;
-
-	len = frame->len;
-
-	txp = (void *) frame_push(frame, sizeof(struct _carl9170_tx_superframe));
-
-	if (txp->s.rix)
-		goto err_out;
-
-	err = carlu_alloc_dev_mem(ar, frame);
-	if (err)
-		goto err_out;
-
-	txp->s.len = cpu_to_le16(frame->len);
-
-	queue = (frame->queue % __AR9170_NUM_TXQ);
-
-	SET_VAL(CARL9170_TX_SUPER_MISC_QUEUE, txp->s.misc, queue);
-
-	txp->f.length = len + FCS_LEN; /* + I(C)V_LEN */
-
-	txp->f.mac_control = cpu_to_le16(AR9170_TX_MAC_HW_DURATION |
-					 AR9170_TX_MAC_BACKOFF);
-	txp->f.mac_control |= cpu_to_le16(queue << AR9170_TX_MAC_QOS_S);
-
-	txp->f.phy_control = cpu_to_le32(AR9170_TX_PHY_MOD_CCK | AR9170_TX_PHY_BW_20MHZ |
-					 ((17 * 2) << AR9170_TX_PHY_TX_PWR_S) |
-					 (AR9170_TX_PHY_TXCHAIN_1 << AR9170_TX_PHY_TXCHAIN_S) |
-					 (11 << AR9170_TX_PHY_MCS_S));
-
-	frame_queue_tail(&ar->tx_sent_queue[queue], frame);
-	carlusb_tx(ar, frame);
-	return 0;
-
-err_out:
-	frame_pull(frame, sizeof(struct _carl9170_tx_superframe));
-	return err;
-}
diff --git a/carl9170fw/tools/carlu/src/usb.c b/carl9170fw/tools/carlu/src/usb.c
deleted file mode 100644
index ebc19a9..0000000
--- a/carl9170fw/tools/carlu/src/usb.c
+++ /dev/null
@@ -1,793 +0,0 @@
-/*
- * carlu - userspace testing utility for ar9170 devices
- *
- * USB back-end driver
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <stdbool.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <stdlib.h>
-#include "libusb.h"
-
-#include "carlu.h"
-#include "usb.h"
-#include "debug.h"
-#include "list.h"
-#include "cmd.h"
-
-#define ADD_DEV(_vid, _pid, _vs, _ps)	{		\
-	.idVendor = _vid,				\
-	.idProduct = _pid,				\
-	.vendor_name = _vs,				\
-	.product_name = _ps				\
-}
-
-static const struct {
-	uint16_t idVendor;
-	uint16_t idProduct;
-	char *vendor_name;
-	char *product_name;
-} dev_list[] = {
-	ADD_DEV(0x0cf3, 0x9170, "Atheros", "9170"),
-	ADD_DEV(0x0cf3, 0x1001, "Atheros", "TG121N"),
-	ADD_DEV(0x0cf3, 0x1002, "TP-Link", "TL-WN821N v2"),
-	ADD_DEV(0xcace, 0x0300, "Cace", "Airpcap NX"),
-	ADD_DEV(0x07d1, 0x3c10, "D-Link", "DWA 160 A1"),
-	ADD_DEV(0x07d1, 0x3a09, "D-Link", "DWA 160 A2"),
-	ADD_DEV(0x0846, 0x9010, "Netgear", "WNDA3100"),
-	ADD_DEV(0x0846, 0x9001, "Netgear", "WN111 v2"),
-	ADD_DEV(0x0ace, 0x1221, "Zydas", "ZD1221"),
-	ADD_DEV(0x0586, 0x3417, "ZyXEL", "NWD271N"),
-	ADD_DEV(0x0cde, 0x0023, "Z-Com", "UB81 BG"),
-	ADD_DEV(0x0cde, 0x0026, "Z-Com", "UB82 ABG"),
-	ADD_DEV(0x0cde, 0x0027, "Sphairon", "Homelink 1202"),
-	ADD_DEV(0x083a, 0xf522, "Arcadyan", "WN7512"),
-	ADD_DEV(0x2019, 0x5304, "Planex", "GWUS300"),
-	ADD_DEV(0x04bb, 0x093f, "IO-Data", "WNGDNUS2"),
-	ADD_DEV(0x057C, 0x8401, "AVM", "FRITZ!WLAN USB Stick N"),
-	ADD_DEV(0x057C, 0x8402, "AVM", "FRITZ!WLAN USB Stick N 2.4"),
-};
-
-static libusb_context *usb_ctx;
-static LIST_HEAD(active_dev_list);
-
-static int carlusb_event_thread(void *_ar)
-{
-	struct carlu *ar = (void *)_ar;
-	dbg("event thread active and polling.\n");
-
-	while (!ar->stop_event_polling)
-		libusb_handle_events(ar->ctx);
-
-	dbg("==> event thread desixed.\n");
-	return 0;
-}
-
-static int carlusb_is_ar9170(struct libusb_device_descriptor *desc)
-{
-	unsigned int i;
-
-	for (i = 0; i < ARRAY_SIZE(dev_list); i++) {
-		if ((desc->idVendor == dev_list[i].idVendor) &&
-		    (desc->idProduct == dev_list[i].idProduct)) {
-			dbg("== found device \"%s %s\" [0x%04x:0x%04x]\n",
-				dev_list[i].vendor_name, dev_list[i].product_name,
-				desc->idVendor, desc->idProduct);
-
-			return i;
-		}
-	}
-
-	return -1;
-}
-
-static bool carlusb_is_dev(struct carlu *iter,
-			       struct libusb_device *dev)
-{
-	libusb_device *list_dev;
-
-	if (!iter->dev)
-		return false;
-
-	list_dev = libusb_get_device(iter->dev);
-
-	if (libusb_get_bus_number(list_dev) == libusb_get_bus_number(dev) &&
-	    libusb_get_device_address(list_dev) == libusb_get_device_address(dev))
-		return true;
-
-	return false;
-}
-
-int carlusb_show_devinfo(struct carlu *ar)
-{
-	struct libusb_device_descriptor desc;
-	libusb_device *dev;
-	int err;
-
-	dev = libusb_get_device(ar->dev);
-
-	err = libusb_get_device_descriptor(dev, &desc);
-	if (err)
-		return err;
-
-	info("USB Device Information:\n");
-	info("\tUSB VendorID:%.4x(%s), ProductID:%.4x(%s)\n",
-	     dev_list[ar->idx].idVendor, dev_list[ar->idx].vendor_name,
-	     dev_list[ar->idx].idProduct, dev_list[ar->idx].product_name);
-	info("\tBus:%d Address:%d\n", libusb_get_bus_number(dev),
-	     libusb_get_device_address(dev));
-
-	return 0;
-}
-
-static int carlusb_get_dev(struct carlu *ar, bool reset)
-{
-	struct carlu *iter;
-	libusb_device_handle *dev;
-	libusb_device **list;
-	int ret, err, i, idx = -1;
-
-	ret = libusb_get_device_list(usb_ctx, &list);
-	if (ret < 0) {
-		err("usb device enum failed (%d)\n", ret);
-		return ret;
-	}
-
-	for (i = 0; i < ret; i++) {
-		struct libusb_device_descriptor desc;
-
-		memset(&desc, 0, sizeof(desc));
-		err = libusb_get_device_descriptor(list[i], &desc);
-		if (err != 0)
-			continue;
-
-		idx = carlusb_is_ar9170(&desc);
-		if (idx < 0)
-			continue;
-
-		list_for_each_entry(iter, &active_dev_list, dev_list) {
-			if (carlusb_is_dev(iter, list[i])) {
-				err = -EALREADY;
-				break;
-			}
-		}
-
-		if (err)
-			continue;
-
-		err = libusb_open(list[i], &dev);
-		if (err != 0) {
-			err("failed to open device (%d)\n", err);
-			continue;
-		}
-
-		err = libusb_kernel_driver_active(dev, 0);
-		switch (err) {
-		case 0:
-			break;
-		default:
-			err("failed to aquire exculusive access (%d).\n", err);
-			goto skip;
-		}
-
-		if (reset) {
-			err = libusb_reset_device(dev);
-			if (err != 0) {
-				err("failed to reset device (%d)\n", err);
-				goto skip;
-			}
-		}
-
-		err = libusb_claim_interface(dev, 0);
-		if (err == 0) {
-			dbg(">device is now under our control.\n");
-			break;
-		} else {
-			err("failed to claim device (%d)\n", err);
-			goto skip;
-		}
-
-skip:
-		libusb_close(dev);
-	}
-
-	if (i != ret) {
-		ar->idx = idx;
-		ar->ctx = usb_ctx;
-		ar->dev = dev;
-		list_add_tail(&ar->dev_list, &active_dev_list);
-		ret = 0;
-	} else {
-		ret = -ENODEV;
-	}
-
-	libusb_free_device_list(list, 1);
-	return ret;
-}
-
-static void carlusb_tx_cb(struct carlu *ar,
-			      struct frame *frame)
-{
-	if (ar->tx_cb)
-		ar->tx_cb(ar, frame);
-
-	ar->tx_octets += frame->len;
-
-	carlu_free_frame(ar, frame);
-}
-
-static void carlusb_zap_queues(struct carlu *ar)
-{
-	struct frame *frame;
-
-	BUG_ON(SDL_mutexP(ar->tx_queue_lock) != 0);
-	while (!list_empty(&ar->tx_queue)) {
-		frame = list_first_entry(&ar->tx_queue, struct frame, dcb.list);
-		list_del(&frame->dcb.list);
-		carlusb_tx_cb(ar, frame);
-	}
-	SDL_mutexV(ar->tx_queue_lock);
-}
-
-static void carlusb_free_driver(struct carlu *ar)
-{
-	if (!IS_ERR_OR_NULL(ar)) {
-		if (ar->event_pipe[0] > -1)
-			close(ar->event_pipe[0]);
-
-		if (ar->event_pipe[1] > -1)
-			close(ar->event_pipe[1]);
-
-		carlusb_zap_queues(ar);
-		carlfw_release(ar->fw);
-		ar->fw = NULL;
-
-		if (ar->dev) {
-			libusb_release_interface(ar->dev, 0);
-			libusb_close(ar->dev);
-			ar->dev = NULL;
-		}
-		carlu_free_driver(ar);
-	}
-}
-
-static int carlusb_init(struct carlu *ar)
-{
-	init_list_head(&ar->tx_queue);
-	ar->tx_queue_lock = SDL_CreateMutex();
-	ar->event_pipe[0] = ar->event_pipe[1] = -1;
-
-	return 0;
-}
-
-static struct carlu *carlusb_open(void)
-{
-	struct carlu *tmp;
-	int err;
-
-	tmp = carlu_alloc_driver(sizeof(*tmp));
-	if (tmp == NULL)
-		return NULL;
-
-	err = carlusb_init(tmp);
-	if (err < 0)
-		goto err_out;
-
-	err = carlusb_get_dev(tmp, true);
-	if (err < 0)
-		goto err_out;
-
-	return tmp;
-
-err_out:
-	carlusb_free_driver(tmp);
-	return ERR_PTR(err);
-}
-
-static void carlusb_cancel_rings(struct carlu *ar)
-{
-	unsigned int i;
-
-	for (i = 0; i < ARRAY_SIZE(ar->rx_ring); i++)
-		libusb_cancel_transfer(ar->rx_ring[i]);
-
-	libusb_cancel_transfer(ar->rx_interrupt);
-}
-
-static void carlusb_free_rings(struct carlu *ar)
-{
-	unsigned int i;
-
-	for (i = 0; i < ARRAY_SIZE(ar->rx_ring); i++)
-		libusb_free_transfer(ar->rx_ring[i]);
-
-	libusb_free_transfer(ar->rx_interrupt);
-}
-
-static void carlusb_destroy(struct carlu *ar)
-{
-	int event_thread_status;
-
-	dbg("==>release device.\n");
-
-	ar->stop_event_polling = true;
-
-	carlusb_cancel_rings(ar);
-
-	SDL_WaitThread(ar->event_thread, &event_thread_status);
-
-	carlusb_free_rings(ar);
-	list_del(&ar->dev_list);
-}
-
-static void carlusb_tx_bulk_cb(struct libusb_transfer *transfer);
-
-static void carlusb_tx_pending(struct carlu *ar)
-{
-	struct frame *frame;
-	struct libusb_transfer *urb;
-	int err;
-
-	BUG_ON(SDL_mutexP(ar->tx_queue_lock) != 0);
-	if (ar->tx_queue_len >= (AR9170_TX_MAX_ACTIVE_URBS) ||
-	    list_empty(&ar->tx_queue))
-		goto out;
-
-	ar->tx_queue_len++;
-
-	urb = libusb_alloc_transfer(0);
-	if (urb == NULL)
-		goto out;
-
-	frame = list_first_entry(&ar->tx_queue, struct frame, dcb.list);
-	list_del(&frame->dcb.list);
-
-	if (ar->tx_stream) {
-		struct ar9170_stream *tx_stream;
-
-		tx_stream = frame_push(frame, sizeof(*tx_stream));
-		tx_stream->length = cpu_to_le16(frame->len);
-		tx_stream->tag = cpu_to_le16(0x697e);
-	}
-
-	libusb_fill_bulk_transfer(urb, ar->dev, AR9170_EP_TX, (unsigned char *)
-		frame->data, frame->len, carlusb_tx_bulk_cb, (void *)frame, 0);
-
-	/* FIXME: ZERO_PACKET support! */
-	urb->flags |= LIBUSB_TRANSFER_FREE_TRANSFER;
-/*	urb->flags |= LIBUSB_TRANSFER_ZERO_PACKET; */
-	frame->dev = (void *) ar;
-	frame_get(frame);
-
-	err = libusb_submit_transfer(urb);
-	if (err != 0) {
-		err("->usb bulk tx submit failed (%d).\n", err);
-		libusb_free_transfer(urb);
-	}
-
-out:
-	SDL_mutexV(ar->tx_queue_lock);
-	return;
-}
-
-void carlusb_tx(struct carlu *ar, struct frame *frame)
-{
-	BUG_ON(SDL_mutexP(ar->tx_queue_lock) != 0);
-
-	list_add_tail(&frame->dcb.list, &ar->tx_queue);
-	SDL_mutexV(ar->tx_queue_lock);
-
-	carlusb_tx_pending(ar);
-}
-
-static void carlusb_tx_bulk_cb(struct libusb_transfer *transfer)
-{
-	struct frame *frame = (void *) transfer->user_data;
-	struct carlu *ar = (void *) frame->dev;
-
-	BUG_ON(SDL_mutexP(ar->tx_queue_lock) != 0);
-	ar->tx_queue_len--;
-	SDL_mutexV(ar->tx_queue_lock);
-
-	if (ar->tx_stream)
-		frame_pull(frame, 4);
-
-	carlusb_tx_cb(ar, frame);
-	carlusb_tx_pending(ar);
-}
-
-static void carlusb_rx_interrupt_cb(struct libusb_transfer *transfer)
-{
-	struct carlu *ar = (void *) transfer->user_data;
-	int err;
-
-	switch (transfer->status) {
-	case LIBUSB_TRANSFER_COMPLETED:
-		carlu_handle_command(ar, transfer->buffer, transfer->actual_length);
-		break;
-
-	case LIBUSB_TRANSFER_CANCELLED:
-		return;
-
-	default:
-		err("==>rx_irq urb died (%d)\n", transfer->status);
-		break;
-	}
-
-	err = libusb_submit_transfer(transfer);
-	if (err != 0)
-		err("==>rx_irq urb resubmit failed (%d)\n", err);
-}
-
-static void carlusb_rx_bulk_cb(struct libusb_transfer *transfer)
-{
-	struct frame *frame = (void *) transfer->user_data;
-	struct carlu *ar = (void *) frame->dev;
-	int err;
-
-	switch (transfer->status) {
-	case LIBUSB_TRANSFER_COMPLETED:
-		frame_put(frame, transfer->actual_length);
-
-		carlu_rx(ar, frame);
-
-		frame_trim(frame, 0);
-		break;
-
-	case LIBUSB_TRANSFER_CANCELLED:
-		return;
-
-	default:
-		err("==>rx_bulk urb died (%d)\n", transfer->status);
-		break;
-	}
-
-	err = libusb_submit_transfer(transfer);
-	if (err != 0)
-		err("->rx_bulk urb resubmit failed (%d)\n", err);
-}
-
-static int carlusb_initialize_rxirq(struct carlu *ar)
-{
-	int err;
-
-	ar->rx_interrupt = libusb_alloc_transfer(0);
-	if (ar->rx_interrupt == NULL) {
-		err("==>cannot alloc rx interrupt urb\n");
-		return -1;
-	}
-
-	libusb_fill_interrupt_transfer(ar->rx_interrupt, ar->dev, AR9170_EP_IRQ,
-				       (unsigned char *)&ar->irq_buf, sizeof(ar->irq_buf),
-				       carlusb_rx_interrupt_cb, (void *) ar, 0);
-
-	err = libusb_submit_transfer(ar->rx_interrupt);
-	if (err != 0) {
-		err("==>failed to submit rx interrupt (%d)\n", err);
-		return err;
-	}
-
-	dbg("rx interrupt is now operational.\n");
-	return 0;
-}
-
-static int carlusb_initialize_rxrings(struct carlu *ar)
-{
-	struct frame *tmp;
-	unsigned int i;
-	int err;
-
-	for (i = 0; i < ARRAY_SIZE(ar->rx_ring); i++) {
-		tmp = frame_alloc(ar->rx_max);
-		if (tmp == NULL)
-			return -ENOMEM;
-
-		tmp->dev = (void *) ar;
-
-		ar->rx_ring[i] = libusb_alloc_transfer(0);
-		if (ar->rx_ring[i] == NULL) {
-			frame_free(tmp);
-			return -ENOMEM;
-		}
-
-		libusb_fill_bulk_transfer(ar->rx_ring[i], ar->dev,
-			AR9170_EP_RX, (unsigned char *)tmp->data,
-			ar->rx_max, carlusb_rx_bulk_cb, (void *)tmp, 0);
-
-		err = libusb_submit_transfer(ar->rx_ring[i]);
-		if (err != 0) {
-			err("==>failed to submit rx buld urb (%d)\n", err);
-			return EXIT_FAILURE;
-		}
-	}
-
-	dbg("rx ring is now ready to receive.\n");
-	return 0;
-}
-
-static int carlusb_load_firmware(struct carlu *ar)
-{
-	int ret = 0;
-
-	dbg("loading firmware...\n");
-
-	ar->fw = carlfw_load(CARL9170_FIRMWARE_FILE);
-	if (IS_ERR_OR_NULL(ar->fw))
-		return PTR_ERR(ar->fw);
-
-	ret = carlu_fw_check(ar);
-	if (ret)
-		return ret;
-
-	ret = carlusb_fw_check(ar);
-	if (ret)
-		return ret;
-
-	return 0;
-}
-
-static int carlusb_upload_firmware(struct carlu *ar, bool boot)
-{
-	uint32_t addr = 0x200000;
-	size_t len;
-	void *buf;
-	int ret = 0;
-
-	dbg("initiating firmware image upload procedure.\n");
-
-	buf = carlfw_get_fw(ar->fw, &len);
-	if (IS_ERR_OR_NULL(buf))
-		return PTR_ERR(buf);
-
-	if (ar->miniboot_size) {
-		dbg("Miniboot firmware size:%d\n", ar->miniboot_size);
-		len -= ar->miniboot_size;
-		buf += ar->miniboot_size;
-	}
-
-	while (len) {
-		int blocklen = len > 4096 ? 4096 : len;
-
-		ret = libusb_control_transfer(ar->dev, 0x40, 0x30, addr >> 8, 0, buf, blocklen, 1000);
-		if (ret != blocklen && ret != LIBUSB_ERROR_TIMEOUT) {
-			err("==>firmware upload failed (%d)\n", ret);
-			return -EXIT_FAILURE;
-		}
-
-		dbg("uploaded %d bytes to start address 0x%04x.\n", blocklen, addr);
-
-		buf += blocklen;
-		addr += blocklen;
-		len -= blocklen;
-	}
-
-	if (boot) {
-		ret = libusb_control_transfer(ar->dev, 0x40, 0x31, 0, 0, NULL, 0, 5000);
-		if (ret < 0) {
-			err("unable to boot firmware (%d)\n", ret);
-			return -EXIT_FAILURE;
-		}
-
-		/* give the firmware some time to reset & reboot */
-		SDL_Delay(100);
-
-		/*
-		 * since the device did a full usb reset,
-		 * we have to get a new "dev".
-		 */
-		libusb_release_interface(ar->dev, 0);
-		libusb_close(ar->dev);
-		ar->dev = NULL;
-		list_del(&ar->dev_list);
-
-		ret = carlusb_get_dev(ar, false);
-	}
-
-	return 0;
-}
-
-int carlusb_cmd_async(struct carlu *ar, struct carl9170_cmd *cmd,
-		      const bool free_buf)
-{
-	struct libusb_transfer *urb;
-	int ret, send;
-
-	if (cmd->hdr.len > (CARL9170_MAX_CMD_LEN - 4)) {
-		err("|-> too much payload\n");
-		ret = -EINVAL;
-		goto out;
-	}
-
-	if (cmd->hdr.len % 4) {
-		err("|-> invalid command length\n");
-		ret = -EINVAL;
-		goto out;
-	}
-
-	ret = libusb_interrupt_transfer(ar->dev, AR9170_EP_CMD, (void *) cmd, cmd->hdr.len + 4, &send, 32);
-	if (ret != 0) {
-		err("OID:0x%.2x failed due to (%d) (%d).\n", cmd->hdr.cmd, ret, send);
-		print_hex_dump_bytes(ERROR, "CMD:", cmd, cmd->hdr.len);
-	}
-
-out:
-	if (free_buf)
-		free((void *)cmd);
-
-	return ret;
-}
-
-int carlusb_cmd(struct carlu *ar, uint8_t oid,
-		      uint8_t *cmd, size_t clen,
-		      uint8_t *rsp, size_t rlen)
-{
-	int ret, send;
-
-	if (clen > (CARL9170_MAX_CMD_LEN - 4)) {
-		err("|-> OID:0x%.2x has too much payload (%d octs)\n", oid, (int)clen);
-		return -EINVAL;
-	}
-
-	ret = SDL_mutexP(ar->resp_lock);
-	if (ret != 0) {
-		err("failed to acquire resp_lock.\n");
-		print_hex_dump_bytes(ERROR, "CMD:", ar->cmd.buf, clen);
-		return -1;
-	}
-
-	ar->cmd.cmd.hdr.len = clen;
-	ar->cmd.cmd.hdr.cmd = oid;
-	/* buf[2] & buf[3] are padding */
-	if (clen && cmd != (uint8_t *)(&ar->cmd.cmd.data))
-		memcpy(&ar->cmd.cmd.data, cmd, clen);
-
-	ar->resp_buf = (uint8_t *)rsp;
-	ar->resp_len = rlen;
-
-	ret = carlusb_cmd_async(ar, &ar->cmd.cmd, false);
-	if (ret != 0) {
-		err("OID:0x%.2x failed due to (%d) (%d).\n", oid, ret, send);
-		print_hex_dump_bytes(ERROR, "CMD:", ar->cmd.buf, clen);
-		SDL_mutexV(ar->resp_lock);
-		return ret;
-	}
-
-	ret = SDL_CondWaitTimeout(ar->resp_pend, ar->resp_lock, 100);
-	if (ret != 0) {
-		err("|-> OID:0x%.2x timed out %d.\n", oid, ret);
-		ar->resp_buf = NULL;
-		ar->resp_len = 0;
-		ret = -ETIMEDOUT;
-	}
-
-	SDL_mutexV(ar->resp_lock);
-	return ret;
-}
-
-struct carlu *carlusb_probe(void)
-{
-	struct carlu *ar;
-	int ret = -ENOMEM;
-
-	ar = carlusb_open();
-	if (IS_ERR_OR_NULL(ar)) {
-		if (IS_ERR(ar))
-			ret = PTR_ERR(ar);
-		goto err_out;
-	}
-
-	ret = carlusb_show_devinfo(ar);
-	if (ret)
-		goto err_out;
-
-	ret = carlusb_load_firmware(ar);
-	if (ret)
-		goto err_out;
-
-	ret = pipe(ar->event_pipe);
-	if (ret)
-		goto err_out;
-
-	ar->stop_event_polling = false;
-	ar->event_thread = SDL_CreateThread(carlusb_event_thread, ar);
-
-	ret = carlusb_upload_firmware(ar, true);
-	if (ret)
-		goto err_kill;
-
-	ret = carlusb_initialize_rxirq(ar);
-	if (ret)
-		goto err_kill;
-
-	ret = carlusb_initialize_rxrings(ar);
-	if (ret)
-		goto err_kill;
-
-	ret = carlu_cmd_echo(ar, 0x44110dee);
-	if (ret) {
-		err("echo test failed...\n");
-		goto err_kill;
-	}
-
-	info("firmware is active and running.\n");
-
-	carlu_fw_info(ar);
-
-	return ar;
-
-err_kill:
-	carlusb_destroy(ar);
-
-err_out:
-	carlusb_free_driver(ar);
-	err("usb device rendezvous failed (%d).\n", ret);
-	return ERR_PTR(ret);
-}
-
-void carlusb_close(struct carlu *ar)
-{
-	carlu_cmd_reboot(ar);
-
-	carlusb_destroy(ar);
-	carlusb_free_driver(ar);
-}
-
-int carlusb_print_known_devices(void)
-{
-	unsigned int i;
-
-	debug_level = INFO;
-
-	info("==> dumping known device list <==\n");
-	for (i = 0; i < ARRAY_SIZE(dev_list); i++) {
-		info("Vendor:\"%-9s\" Product:\"%-26s\" => USBID:[0x%04x:0x%04x]\n",
-		     dev_list[i].vendor_name, dev_list[i].product_name,
-		     dev_list[i].idVendor, dev_list[i].idProduct);
-	}
-	info("==> end of device list <==\n");
-
-	return EXIT_SUCCESS;
-}
-
-int usb_init(void)
-{
-	int ret;
-
-	ret = libusb_init(&usb_ctx);
-	if (ret != 0) {
-		err("failed to initialize usb subsystem (%d)\n", ret);
-		return ret;
-	}
-
-	/* like a silent chatterbox! */
-	libusb_set_debug(usb_ctx, 2);
-
-	return 0;
-}
-
-void usb_exit(void)
-{
-	libusb_exit(usb_ctx);
-}
diff --git a/carl9170fw/tools/carlu/src/usb.h b/carl9170fw/tools/carlu/src/usb.h
deleted file mode 100644
index 66c674f..0000000
--- a/carl9170fw/tools/carlu/src/usb.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * carlu - userspace testing utility for ar9170 devices
- *
- * USB back-end API declaration
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef __CARL9170USER_USB_H
-#define __CARL9170USER_USB_H
-
-#include "SDL.h"
-#include "SDL_thread.h"
-#include "libusb.h"
-#include "frame.h"
-#include "list.h"
-
-#include "fwcmd.h"
-#include <unistd.h>
-#include "carlu.h"
-
-#define AR9170_RX_BULK_BUFS		16
-#define AR9170_RX_BULK_BUF_SIZE		8192
-#define AR9170_RX_BULK_IRQ_SIZE		64
-
-/* endpoints */
-#define AR9170_EP_TX				(LIBUSB_ENDPOINT_OUT | AR9170_USB_EP_TX)
-#define AR9170_EP_RX				(LIBUSB_ENDPOINT_IN  | AR9170_USB_EP_RX)
-#define AR9170_EP_IRQ				(LIBUSB_ENDPOINT_IN  | AR9170_USB_EP_IRQ)
-#define AR9170_EP_CMD				(LIBUSB_ENDPOINT_OUT | AR9170_USB_EP_CMD)
-
-#define AR9170_TX_MAX_ACTIVE_URBS		8
-
-#define CARL9170_FIRMWARE_FILE (CARLU_PATH "/../../carlfw/carl9170.fw")
-
-struct carlu;
-
-void carlusb_reset_txep(struct carlu *ar);
-
-int usb_init(void);
-void usb_exit(void);
-
-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 carlu *ar);
-
-int carlusb_cmd(struct carlu *_ar, uint8_t oid, uint8_t *cmd, size_t clen,
-		uint8_t *rsp, size_t rlen);
-
-int carlusb_print_known_devices(void);
-
-#endif /* __CARL9170USER_USB_H */