diff --git a/fw/include/at86rf230.h b/fw/include/at86rf230.h
index afe190c..502eeac 100644
--- a/fw/include/at86rf230.h
+++ b/fw/include/at86rf230.h
@@ -113,20 +113,20 @@ enum {
 	TRAC_STATUS_INVALID			= 7
 };
 
-/* --- TRX_STATE [4:0] ----------------------------------------------------- */
+/* --- TRX_CMD [4:0] ----------------------------------------------------- */
 
-#define	TRX_STATE_SHIFT		0
-#define	TRX_STATE_MASK		7
+#define	TRX_CMD_SHIFT	0
+#define	TRX_CMD_MASK	7
 
 enum {
-	TRX_STATE_NOP			= 0x00,	/* reset default */
-	TRX_STATE_TX_START		= 0x02,
-	TRX_STATE_FORCE_TRX_OFF		= 0x03,
-	TRX_STATE_RX_ON			= 0x06,
-	TRX_STATE_TRX_OFF		= 0x08,
-	TRX_STATE_PLL_ON		= 0x09,
-	TRX_STATE_RX_AACK_ON		= 0x16,
-	TRX_STATE_TX_ARET_ON		= 0x19,
+	TRX_CMD_NOP		= 0x00,	/* reset default */
+	TRX_CMD_TX_START	= 0x02,
+	TRX_CMD_FORCE_TRX_OFF	= 0x03,
+	TRX_CMD_RX_ON		= 0x06,
+	TRX_CMD_TRX_OFF		= 0x08,
+	TRX_CMD_PLL_ON		= 0x09,
+	TRX_CMD_RX_AACK_ON	= 0x16,
+	TRX_CMD_TX_ARET_ON	= 0x19,
 };
 
 /* --- TRX_CTRL_0 [7:6] ---------------------------------------------------- */
diff --git a/tools/atspi-id/Makefile b/tools/atspi-id/Makefile
index 51118cb..4a6d3fb 100644
--- a/tools/atspi-id/Makefile
+++ b/tools/atspi-id/Makefile
@@ -1,5 +1,5 @@
 #
-# atspi/Makefile - Build the ATSPI identification utility
+# atspi-id/Makefile - Build the ATSPI identification utility
 #
 # Written 2010 by Werner Almesberger
 # Copyright 2010 Werner Almesberger
diff --git a/tools/atspi-txrx/Makefile b/tools/atspi-txrx/Makefile
new file mode 100644
index 0000000..5b92a5a
--- /dev/null
+++ b/tools/atspi-txrx/Makefile
@@ -0,0 +1,21 @@
+#
+# atspi-txrx/Makefile - Build the TX/RX test utility
+#
+# Written 2010 by Werner Almesberger
+# Copyright 2010 Werner Almesberger
+#
+# 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.
+#
+
+
+F32XBASE = ../../../f32xbase
+
+MAIN = atspi-txrx
+
+include $(F32XBASE)/lib/Makefile.common
+
+CFLAGS += -I../../fw/include -I../include
+LDLIBS += -L../lib -latspi
diff --git a/tools/atspi-txrx/atspi-txrx.c b/tools/atspi-txrx/atspi-txrx.c
new file mode 100644
index 0000000..a0779d2
--- /dev/null
+++ b/tools/atspi-txrx/atspi-txrx.c
@@ -0,0 +1,50 @@
+/*
+ * atspi-txrx/atspi-txrx.c - ben-wpan AF86RF230 TX/RX
+ *
+ * Written 2010 by Werner Almesberger
+ * Copyright 2010 Werner Almesberger
+ *
+ * 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.
+ */
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <usb.h>
+
+#include "at86rf230.h"
+#include "atspi/ep0.h"
+#include "atspi.h"
+
+
+#define	FROM_DEV	ATSPI_FROM_DEV(0)
+#define	TO_DEV		ATSPI_TO_DEV(0)
+
+#define	BUF_SIZE	256
+
+
+static void usage(const char *name)
+{
+	fprintf(stderr, "%s\n", name);
+	exit(1);
+}
+
+
+int main(int argc, const char **argv)
+{
+	usb_dev_handle *dev;
+
+	if (argc != 1)
+		usage(*argv);
+	dev = atspi_open();
+	if (!dev)
+		return 1;
+
+	atspi_reg_write(dev, REG_TRX_STATE, TRX_CMD_TRX_OFF);
+	sleep(1000);
+
+	return 0;
+}