Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #49 from jboone/master

Browse Source 
Dubious pull request containing...
This commit is contained in:
Michael Ossmann
2013-05-11 17:20:22 -07:00
parent e018dbb07f d0e609429d
commit d8a25e29a1
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
firmware/common/hackrf_core.c
View File

@ -252,7 +252,8 @@ void cpu_clock_init(void)
| CGU_PLL1_CTRL_PSEL(0) | CGU_PLL1_CTRL_PSEL(0)
| CGU_PLL1_CTRL_NSEL(0) | CGU_PLL1_CTRL_NSEL(0)
| CGU_PLL1_CTRL_MSEL(16) | CGU_PLL1_CTRL_MSEL(16)
| CGU_PLL1_CTRL_FBSEL; | CGU_PLL1_CTRL_FBSEL
| CGU_PLL1_CTRL_DIRECT;
/* wait until stable */ /* wait until stable */
while (!(CGU_PLL1_STAT & CGU_PLL1_STAT_LOCK)); while (!(CGU_PLL1_STAT & CGU_PLL1_STAT_LOCK));
@ -368,17 +369,21 @@ void pin_setup(void) {
GPIO_DIR(PORT_CPLD_TDI) &= ~PIN_CPLD_TDI; GPIO_DIR(PORT_CPLD_TDI) &= ~PIN_CPLD_TDI;
/* Configure SCU Pin Mux as GPIO */ /* Configure SCU Pin Mux as GPIO */
scu_pinmux(SCU_PINMUX_LED1, SCU_GPIO_FAST); scu_pinmux(SCU_PINMUX_LED1, SCU_GPIO_NOPULL);
scu_pinmux(SCU_PINMUX_LED2, SCU_GPIO_FAST); scu_pinmux(SCU_PINMUX_LED2, SCU_GPIO_NOPULL);
scu_pinmux(SCU_PINMUX_LED3, SCU_GPIO_FAST); scu_pinmux(SCU_PINMUX_LED3, SCU_GPIO_NOPULL);
scu_pinmux(SCU_PINMUX_EN1V8, SCU_GPIO_FAST); scu_pinmux(SCU_PINMUX_EN1V8, SCU_GPIO_NOPULL);
scu_pinmux(SCU_PINMUX_BOOT0, SCU_GPIO_FAST); scu_pinmux(SCU_PINMUX_BOOT0, SCU_GPIO_FAST);
scu_pinmux(SCU_PINMUX_BOOT1, SCU_GPIO_FAST); scu_pinmux(SCU_PINMUX_BOOT1, SCU_GPIO_FAST);
scu_pinmux(SCU_PINMUX_BOOT2, SCU_GPIO_FAST); scu_pinmux(SCU_PINMUX_BOOT2, SCU_GPIO_FAST);
scu_pinmux(SCU_PINMUX_BOOT3, SCU_GPIO_FAST); scu_pinmux(SCU_PINMUX_BOOT3, SCU_GPIO_FAST);
/* Configure USB indicators */
scu_pinmux(SCU_PINMUX_USB_LED0, SCU_CONF_FUNCTION3);
scu_pinmux(SCU_PINMUX_USB_LED1, SCU_CONF_FUNCTION3);
/* Configure all GPIO as Input (safe state) */ /* Configure all GPIO as Input (safe state) */
GPIO0_DIR = 0; GPIO0_DIR = 0;
GPIO1_DIR = 0; GPIO1_DIR = 0;

4
firmware/common/hackrf_core.h
View File

@ -61,6 +61,10 @@ extern "C"
#define SCU_PINMUX_BOOT2 (P2_8) /* GPIO5[7] on P2_8 */ #define SCU_PINMUX_BOOT2 (P2_8) /* GPIO5[7] on P2_8 */
#define SCU_PINMUX_BOOT3 (P2_9) /* GPIO1[10] on P2_9 */ #define SCU_PINMUX_BOOT3 (P2_9) /* GPIO1[10] on P2_9 */
/* USB peripheral */
#define SCU_PINMUX_USB_LED0 (P6_8)
#define SCU_PINMUX_USB_LED1 (P6_7)
/* SSP1 Peripheral PinMux */ /* SSP1 Peripheral PinMux */
#define SCU_SSP1_MISO (P1_3) /* P1_3 */ #define SCU_SSP1_MISO (P1_3) /* P1_3 */
#define SCU_SSP1_MOSI (P1_4) /* P1_4 */ #define SCU_SSP1_MOSI (P1_4) /* P1_4 */

3
host/libhackrf/CMakeLists.txt
View File

@ -31,7 +31,8 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
cmake_minimum_required(VERSION 2.8) cmake_minimum_required(VERSION 2.8)
add_definitions(-Wall) add_definitions(-Wall)
add_definitions(-std=c99) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
find_package(USB1 REQUIRED) find_package(USB1 REQUIRED)
include_directories(${LIBUSB_INCLUDE_DIR}) include_directories(${LIBUSB_INCLUDE_DIR})