From 389cbc6ac4c19503814dbd81053e087b9b3c1434 Mon Sep 17 00:00:00 2001 From: Michael Ossmann Date: Sat, 18 May 2013 08:51:34 -0600 Subject: [PATCH] renamed usb_performance to hackrf_usb --- firmware/Makefile | 4 ++-- firmware/README | 5 +++++ firmware/{usb_performance => hackrf_usb}/Makefile | 2 +- .../{usb_performance => hackrf_usb}/Makefile_rom_to_ram | 4 ++-- .../usb_performance.c => hackrf_usb/hackrf_usb.c} | 0 firmware/{usb_performance => hackrf_usb}/usb.c | 0 firmware/{usb_performance => hackrf_usb}/usb.h | 0 firmware/{usb_performance => hackrf_usb}/usb_descriptor.c | 0 firmware/{usb_performance => hackrf_usb}/usb_descriptor.h | 0 firmware/{usb_performance => hackrf_usb}/usb_request.c | 0 firmware/{usb_performance => hackrf_usb}/usb_request.h | 0 .../{usb_performance => hackrf_usb}/usb_standard_request.c | 0 .../{usb_performance => hackrf_usb}/usb_standard_request.h | 0 firmware/{usb_performance => hackrf_usb}/usb_type.h | 0 .../Makefile | 6 +++--- 15 files changed, 13 insertions(+), 8 deletions(-) rename firmware/{usb_performance => hackrf_usb}/Makefile (98%) rename firmware/{usb_performance => hackrf_usb}/Makefile_rom_to_ram (95%) rename firmware/{usb_performance/usb_performance.c => hackrf_usb/hackrf_usb.c} (100%) rename firmware/{usb_performance => hackrf_usb}/usb.c (100%) rename firmware/{usb_performance => hackrf_usb}/usb.h (100%) rename firmware/{usb_performance => hackrf_usb}/usb_descriptor.c (100%) rename firmware/{usb_performance => hackrf_usb}/usb_descriptor.h (100%) rename firmware/{usb_performance => hackrf_usb}/usb_request.c (100%) rename firmware/{usb_performance => hackrf_usb}/usb_request.h (100%) rename firmware/{usb_performance => hackrf_usb}/usb_standard_request.c (100%) rename firmware/{usb_performance => hackrf_usb}/usb_standard_request.h (100%) rename firmware/{usb_performance => hackrf_usb}/usb_type.h (100%) rename firmware/{usb_performance_rom_to_ram => hackrf_usb_rom_to_ram}/Makefile (94%) diff --git a/firmware/Makefile b/firmware/Makefile index 2818477d..0aafc166 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -29,8 +29,8 @@ TARGETS = blinky \ startup \ startup_systick \ startup_systick_perfo \ - usb_performance \ - usb_performance_rom_to_ram + hackrf_usb \ + hackrf_usb_rom_to_ram # blinky_rom_to_ram # sgpio_passthrough_rom_to_ram diff --git a/firmware/README b/firmware/README index 0e4710e2..2d28d936 100644 --- a/firmware/README +++ b/firmware/README @@ -1,3 +1,8 @@ +The primary firmware source code for USB HackRF devices is hackrf_usb. Most of +the other directories contain firmware source code for test and development. +The common directory contains source code shared by multiple HackRF firmware +projects. + The firmware is set up for compilation with the GCC toolchain available here: https://code.launchpad.net/gcc-arm-embedded diff --git a/firmware/usb_performance/Makefile b/firmware/hackrf_usb/Makefile similarity index 98% rename from firmware/usb_performance/Makefile rename to firmware/hackrf_usb/Makefile index b6324b25..3d2b4d53 100644 --- a/firmware/usb_performance/Makefile +++ b/firmware/hackrf_usb/Makefile @@ -20,7 +20,7 @@ # Boston, MA 02110-1301, USA. # -BINARY = usb_performance +BINARY = hackrf_usb SRC = $(BINARY).c \ usb.c \ diff --git a/firmware/usb_performance/Makefile_rom_to_ram b/firmware/hackrf_usb/Makefile_rom_to_ram similarity index 95% rename from firmware/usb_performance/Makefile_rom_to_ram rename to firmware/hackrf_usb/Makefile_rom_to_ram index ea246313..bd71216d 100644 --- a/firmware/usb_performance/Makefile_rom_to_ram +++ b/firmware/hackrf_usb/Makefile_rom_to_ram @@ -20,9 +20,9 @@ # Boston, MA 02110-1301, USA. # -BINARY = usb_performance_rom_to_ram +BINARY = hackrf_usb_rom_to_ram -SRC = usb_performance.c \ +SRC = hackrf_usb.c \ usb.c \ usb_request.c \ usb_standard_request.c \ diff --git a/firmware/usb_performance/usb_performance.c b/firmware/hackrf_usb/hackrf_usb.c similarity index 100% rename from firmware/usb_performance/usb_performance.c rename to firmware/hackrf_usb/hackrf_usb.c diff --git a/firmware/usb_performance/usb.c b/firmware/hackrf_usb/usb.c similarity index 100% rename from firmware/usb_performance/usb.c rename to firmware/hackrf_usb/usb.c diff --git a/firmware/usb_performance/usb.h b/firmware/hackrf_usb/usb.h similarity index 100% rename from firmware/usb_performance/usb.h rename to firmware/hackrf_usb/usb.h diff --git a/firmware/usb_performance/usb_descriptor.c b/firmware/hackrf_usb/usb_descriptor.c similarity index 100% rename from firmware/usb_performance/usb_descriptor.c rename to firmware/hackrf_usb/usb_descriptor.c diff --git a/firmware/usb_performance/usb_descriptor.h b/firmware/hackrf_usb/usb_descriptor.h similarity index 100% rename from firmware/usb_performance/usb_descriptor.h rename to firmware/hackrf_usb/usb_descriptor.h diff --git a/firmware/usb_performance/usb_request.c b/firmware/hackrf_usb/usb_request.c similarity index 100% rename from firmware/usb_performance/usb_request.c rename to firmware/hackrf_usb/usb_request.c diff --git a/firmware/usb_performance/usb_request.h b/firmware/hackrf_usb/usb_request.h similarity index 100% rename from firmware/usb_performance/usb_request.h rename to firmware/hackrf_usb/usb_request.h diff --git a/firmware/usb_performance/usb_standard_request.c b/firmware/hackrf_usb/usb_standard_request.c similarity index 100% rename from firmware/usb_performance/usb_standard_request.c rename to firmware/hackrf_usb/usb_standard_request.c diff --git a/firmware/usb_performance/usb_standard_request.h b/firmware/hackrf_usb/usb_standard_request.h similarity index 100% rename from firmware/usb_performance/usb_standard_request.h rename to firmware/hackrf_usb/usb_standard_request.h diff --git a/firmware/usb_performance/usb_type.h b/firmware/hackrf_usb/usb_type.h similarity index 100% rename from firmware/usb_performance/usb_type.h rename to firmware/hackrf_usb/usb_type.h diff --git a/firmware/usb_performance_rom_to_ram/Makefile b/firmware/hackrf_usb_rom_to_ram/Makefile similarity index 94% rename from firmware/usb_performance_rom_to_ram/Makefile rename to firmware/hackrf_usb_rom_to_ram/Makefile index 0557ec70..0d2ea0e2 100644 --- a/firmware/usb_performance_rom_to_ram/Makefile +++ b/firmware/hackrf_usb_rom_to_ram/Makefile @@ -20,11 +20,11 @@ # Boston, MA 02110-1301, USA. # -BINARY = usb_performance_rom_to_ram +BINARY = hackrf_usb_rom_to_ram -SRC_DIR = usb_performance +SRC_DIR = hackrf_usb -SRC = usb_performance.c \ +SRC = hackrf_usb.c \ usb.c \ usb_request.c \ usb_standard_request.c \