diff --git a/fw/Makefile b/atrf/fw/Makefile similarity index 96% rename from fw/Makefile rename to atrf/fw/Makefile index 9937851..b5f42a2 100644 --- a/fw/Makefile +++ b/atrf/fw/Makefile @@ -11,7 +11,7 @@ # -DIRS=common atspi-boot atspi +DIRS=common boot atspi .PHONY: all depend install uninstall clean spotless diff --git a/fw/atspi/Makefile b/atrf/fw/atspi/Makefile similarity index 96% rename from fw/atspi/Makefile rename to atrf/fw/atspi/Makefile index 3cc0e3e..fb01b58 100644 --- a/fw/atspi/Makefile +++ b/atrf/fw/atspi/Makefile @@ -14,7 +14,7 @@ MAIN = atspi OBJS = $(MAIN) usb descr version ep0 -F32XBASE = ../../../f32xbase +F32XBASE = ../../../../f32xbase include $(F32XBASE)/fw/common/Makefile.system include $(F32XBASE)/fw/common/Makefile.common diff --git a/fw/atspi/atspi.c b/atrf/fw/atspi/atspi.c similarity index 100% rename from fw/atspi/atspi.c rename to atrf/fw/atspi/atspi.c diff --git a/fw/atspi/descr.c b/atrf/fw/atspi/descr.c similarity index 100% rename from fw/atspi/descr.c rename to atrf/fw/atspi/descr.c diff --git a/fw/atspi/ep0.c b/atrf/fw/atspi/ep0.c similarity index 100% rename from fw/atspi/ep0.c rename to atrf/fw/atspi/ep0.c diff --git a/fw/atspi-boot/Makefile b/atrf/fw/boot/Makefile similarity index 84% rename from fw/atspi-boot/Makefile rename to atrf/fw/boot/Makefile index 9a923c7..90b0bd3 100644 --- a/fw/atspi-boot/Makefile +++ b/atrf/fw/boot/Makefile @@ -1,5 +1,5 @@ # -# atspi-boot/Makefile - Makefile for DFU-capable boot loader for ATSPI +# boot/Makefile - Makefile for DFU-capable boot loader for ATSPI # # Written 2008, 2010 by Werner Almesberger # Copyright 2008, 2010 Werner Almesberger @@ -13,7 +13,7 @@ MAIN=boot OBJS=$(MAIN) usb dfu version -F32XBASE = ../../../f32xbase +F32XBASE = ../../../../f32xbase include $(F32XBASE)/fw/common/Makefile.system include $(F32XBASE)/fw/common/Makefile.common diff --git a/fw/common/Makefile b/atrf/fw/common/Makefile similarity index 100% rename from fw/common/Makefile rename to atrf/fw/common/Makefile diff --git a/fw/common/config.h b/atrf/fw/common/config.h similarity index 100% rename from fw/common/config.h rename to atrf/fw/common/config.h diff --git a/fw/common/io.h b/atrf/fw/common/io.h similarity index 100% rename from fw/common/io.h rename to atrf/fw/common/io.h diff --git a/fw/include/at86rf230.h b/atrf/fw/include/at86rf230.h similarity index 99% rename from fw/include/at86rf230.h rename to atrf/fw/include/at86rf230.h index 502eeac..d49050f 100644 --- a/fw/include/at86rf230.h +++ b/atrf/fw/include/at86rf230.h @@ -1,5 +1,5 @@ /* - * atspi/at86rf230.h - AT86RF230 protocol and register definitions + * include/at86rf230.h - AT86RF230 protocol and register definitions * * Written 2008-2010 by Werner Almesberger * Copyright 2008-2010 Werner Almesberger diff --git a/fw/include/atspi/ep0.h b/atrf/fw/include/atspi/ep0.h similarity index 100% rename from fw/include/atspi/ep0.h rename to atrf/fw/include/atspi/ep0.h diff --git a/fw/include/atspi/usb-ids.h b/atrf/fw/include/atspi/usb-ids.h similarity index 100% rename from fw/include/atspi/usb-ids.h rename to atrf/fw/include/atspi/usb-ids.h diff --git a/tools/Makefile b/atrf/tools/Makefile similarity index 93% rename from tools/Makefile rename to atrf/tools/Makefile index c122b5d..6a0c95f 100644 --- a/tools/Makefile +++ b/atrf/tools/Makefile @@ -13,4 +13,4 @@ DIRS=atspi-id atspi-reset atspi-rssi -include ../Makefile.recurse +include ../../Makefile.recurse diff --git a/tools/atspi-id/Makefile b/atrf/tools/atspi-id/Makefile similarity index 94% rename from tools/atspi-id/Makefile rename to atrf/tools/atspi-id/Makefile index 4a6d3fb..10c2c64 100644 --- a/tools/atspi-id/Makefile +++ b/atrf/tools/atspi-id/Makefile @@ -11,7 +11,7 @@ # -F32XBASE = ../../../f32xbase +F32XBASE = ../../../../f32xbase MAIN = atspi-id diff --git a/tools/atspi-id/atspi-id.c b/atrf/tools/atspi-id/atspi-id.c similarity index 100% rename from tools/atspi-id/atspi-id.c rename to atrf/tools/atspi-id/atspi-id.c diff --git a/tools/atspi-reset/Makefile b/atrf/tools/atspi-reset/Makefile similarity index 94% rename from tools/atspi-reset/Makefile rename to atrf/tools/atspi-reset/Makefile index 4a1c4fe..009ec18 100644 --- a/tools/atspi-reset/Makefile +++ b/atrf/tools/atspi-reset/Makefile @@ -11,7 +11,7 @@ # -F32XBASE = ../../../f32xbase +F32XBASE = ../../../../f32xbase MAIN = atspi-reset diff --git a/tools/atspi-reset/atspi-reset.c b/atrf/tools/atspi-reset/atspi-reset.c similarity index 100% rename from tools/atspi-reset/atspi-reset.c rename to atrf/tools/atspi-reset/atspi-reset.c diff --git a/tools/atspi-rssi/Makefile b/atrf/tools/atspi-rssi/Makefile similarity index 94% rename from tools/atspi-rssi/Makefile rename to atrf/tools/atspi-rssi/Makefile index 57edca6..3327236 100644 --- a/tools/atspi-rssi/Makefile +++ b/atrf/tools/atspi-rssi/Makefile @@ -11,7 +11,7 @@ # -F32XBASE = ../../../f32xbase +F32XBASE = ../../../../f32xbase MAIN = atspi-rssi diff --git a/tools/atspi-rssi/atspi-rssi.c b/atrf/tools/atspi-rssi/atspi-rssi.c similarity index 100% rename from tools/atspi-rssi/atspi-rssi.c rename to atrf/tools/atspi-rssi/atspi-rssi.c diff --git a/tools/atspi-txrx/Makefile b/atrf/tools/atspi-txrx/Makefile similarity index 100% rename from tools/atspi-txrx/Makefile rename to atrf/tools/atspi-txrx/Makefile diff --git a/tools/atspi-txrx/atspi-txrx.c b/atrf/tools/atspi-txrx/atspi-txrx.c similarity index 100% rename from tools/atspi-txrx/atspi-txrx.c rename to atrf/tools/atspi-txrx/atspi-txrx.c diff --git a/tools/include/atspi.h b/atrf/tools/include/atspi.h similarity index 52% rename from tools/include/atspi.h rename to atrf/tools/include/atspi.h index 6cd1b10..f7a6477 100644 --- a/tools/include/atspi.h +++ b/atrf/tools/include/atspi.h @@ -1,7 +1,18 @@ +/* + * include/atspi.h - ATSPI access functions library + * + * 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. + */ + #ifndef ATSPI_H #define ATSPI_H - #include #include diff --git a/tools/lib/Makefile b/atrf/tools/lib/Makefile similarity index 95% rename from tools/lib/Makefile rename to atrf/tools/lib/Makefile index f48255b..6e070e6 100644 --- a/tools/lib/Makefile +++ b/atrf/tools/lib/Makefile @@ -11,7 +11,7 @@ # -F32XBASE = ../../../f32xbase +F32XBASE = ../../../../f32xbase LIB = libatspi.a diff --git a/tools/lib/atspi.c b/atrf/tools/lib/atspi.c similarity index 100% rename from tools/lib/atspi.c rename to atrf/tools/lib/atspi.c