From 8d8d457da256688c18437cd7f89d19f2ff73da60 Mon Sep 17 00:00:00 2001 From: Bernd Herzog Date: Sat, 1 Apr 2023 18:57:53 +0200 Subject: [PATCH] refactoring --- firmware/baseband/CMakeLists.txt | 2 +- firmware/baseband/sd_over_usb/hackrf_core.c | 5 -- .../baseband/sd_over_usb/proc_sd_over_usb.cpp | 3 -- .../baseband/sd_over_usb/proc_sd_over_usb.hpp | 48 ------------------- firmware/baseband/sd_over_usb/scsi.h | 5 -- firmware/baseband/sd_over_usb/sd_over_usb.h | 1 - 6 files changed, 1 insertion(+), 63 deletions(-) delete mode 100644 firmware/baseband/sd_over_usb/proc_sd_over_usb.hpp diff --git a/firmware/baseband/CMakeLists.txt b/firmware/baseband/CMakeLists.txt index 3bce25c6..0d6e6947 100644 --- a/firmware/baseband/CMakeLists.txt +++ b/firmware/baseband/CMakeLists.txt @@ -187,7 +187,7 @@ set(AOPT) set(TOPT "-mthumb -DTHUMB") # Define C warning options here -set(CWARN "-Wall -Wextra -Wstrict-prototypes") +set(CWARN "-Wall -Wextra") # Define C++ warning options here set(CPPWARN "-Wall -Wextra") diff --git a/firmware/baseband/sd_over_usb/hackrf_core.c b/firmware/baseband/sd_over_usb/hackrf_core.c index 73d91a4b..bf20577c 100644 --- a/firmware/baseband/sd_over_usb/hackrf_core.c +++ b/firmware/baseband/sd_over_usb/hackrf_core.c @@ -744,8 +744,6 @@ void cpu_clock_init(void) CGU_BASE_SSP1_CLK = CGU_BASE_SSP1_CLK_AUTOBLOCK(1) | CGU_BASE_SSP1_CLK_CLK_SEL(CGU_SRC_PLL1); - // \/ breaks below - #if (defined JAWBREAKER || defined HACKRF_ONE) /* Disable unused clocks */ /* Start with PLLs */ @@ -775,9 +773,6 @@ void cpu_clock_init(void) CGU_BASE_CGU_OUT0_CLK = CGU_BASE_CGU_OUT0_CLK_PD(1); CGU_BASE_CGU_OUT1_CLK = CGU_BASE_CGU_OUT1_CLK_PD(1); -// /\ breaks above - - /* Disable unused peripheral clocks */ CCU1_CLK_APB1_CAN1_CFG = 0; CCU1_CLK_APB1_I2S_CFG = 0; diff --git a/firmware/baseband/sd_over_usb/proc_sd_over_usb.cpp b/firmware/baseband/sd_over_usb/proc_sd_over_usb.cpp index 8a6dcfb9..3645804e 100644 --- a/firmware/baseband/sd_over_usb/proc_sd_over_usb.cpp +++ b/firmware/baseband/sd_over_usb/proc_sd_over_usb.cpp @@ -23,9 +23,6 @@ #include "ch.h" #include "hal.h" -#include "proc_sd_over_usb.hpp" -#include "portapack_shared_memory.hpp" - extern "C" { void start_usb(void); void irq_usb(void); diff --git a/firmware/baseband/sd_over_usb/proc_sd_over_usb.hpp b/firmware/baseband/sd_over_usb/proc_sd_over_usb.hpp deleted file mode 100644 index 5aba4227..00000000 --- a/firmware/baseband/sd_over_usb/proc_sd_over_usb.hpp +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (C) 2015 Jared Boone, ShareBrained Technology, Inc. - * Copyright (C) 2023 Bernd Herzog - * - * This file is part of PortaPack. - * - * 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, 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; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 51 Franklin Street, - * Boston, MA 02110-1301, USA. - */ - -#ifndef __UI_PROC_SD_OVER_USB_H__ -#define __UI_PROC_SD_OVER_USB_H__ - -#include "portapack_shared_memory.hpp" -#include "baseband_processor.hpp" -#include "baseband_thread.hpp" - - -class USBProcessor : public BasebandProcessor { -public: - void execute(const buffer_c8_t&) override {}; - - //void on_message(const Message* const p) override; - -private: - - - //bool configured { false }; - - //BasebandThread baseband_thread { 3072000, this, NORMALPRIO + 20, baseband::Direction::Transmit }; - - - //RequestSignalMessage sig_message { RequestSignalMessage::Signal::FillRequest }; -}; - -#endif /*__UI_PROC_SD_OVER_USB_H__*/ diff --git a/firmware/baseband/sd_over_usb/scsi.h b/firmware/baseband/sd_over_usb/scsi.h index 7c74ca14..ff399a3d 100644 --- a/firmware/baseband/sd_over_usb/scsi.h +++ b/firmware/baseband/sd_over_usb/scsi.h @@ -133,7 +133,6 @@ static inline uint16_t bswap_16(const uint16_t x) __attribute__ ((always_inline)); static inline uint16_t bswap_16(const uint16_t x) { - uint8_t tmp; union { uint16_t x; uint8_t b[2]; } data; @@ -150,9 +149,7 @@ static inline uint32_t bswap_32(const uint32_t x) __attribute__ ((const)) __attribute__ ((always_inline)); - static inline uint32_t bswap_32(const uint32_t x) { - uint8_t tmp; union { uint32_t x; uint8_t b[4]; } data; @@ -173,8 +170,6 @@ static inline uint32_t bswap_32(const uint32_t x) { #define cpu_to_be16(x) bswap_16(x) #define cpu_to_be32(x) bswap_32(x) - - void scsi_command(msd_cbw_t *msd_cbw_data); #endif /* __SCSI_H__ */ \ No newline at end of file diff --git a/firmware/baseband/sd_over_usb/sd_over_usb.h b/firmware/baseband/sd_over_usb/sd_over_usb.h index 1d1622c2..37e4e229 100644 --- a/firmware/baseband/sd_over_usb/sd_over_usb.h +++ b/firmware/baseband/sd_over_usb/sd_over_usb.h @@ -22,7 +22,6 @@ #ifndef __USB_SD_OVER_USB_H__ #define __USB_SD_OVER_USB_H__ - #include #include #include