Unified Firmware

firmware/common/cpld_jtag.c

@@ -21,11 +21,12 @@
 
 #include "cpld_jtag.h"
 #include "hackrf_core.h"
+#include "platform_detect.h"
 #include "xapp058/micro.h"
 #include <libopencm3/lpc43xx/scu.h>
 #include <stdint.h>
 
-#ifndef PRALINE
+#if !defined(PRALINE) || defined(UNIVERSAL)
 static refill_buffer_cb refill_buffer;
 static uint32_t xsvf_buffer_len, xsvf_pos;
 static unsigned char* xsvf_buffer;
@@ -35,52 +36,86 @@ void cpld_jtag_take(jtag_t* const jtag)
 {
 	const jtag_gpio_t* const gpio = jtag->gpio;
 
+	board_id_t board_id = detected_platform();
+
 	/* Set initial GPIO state to the voltages of the internal or external pull-ups/downs,
 	 * to avoid any glitches.
 	 */
-#if (defined HACKRF_ONE || defined PRALINE)
-	gpio_set(gpio->gpio_pp_tms);
+	switch (board_id) {
+	case BOARD_ID_HACKRF1_OG:
+	case BOARD_ID_HACKRF1_R9:
+	case BOARD_ID_PRALINE:
+#if defined(HACKRF_ONE) || defined(PRALINE) || defined(UNIVERSAL)
+		gpio_set(gpio->gpio_pp_tms);
 #endif
+		break;
+	default:
+		break;
+	}
 	gpio_clear(gpio->gpio_tck);
-#ifndef PRALINE
-	gpio_set(gpio->gpio_tms);
-	gpio_set(gpio->gpio_tdi);
+	if (board_id != BOARD_ID_PRALINE) {
+#if !defined(PRALINE) || defined(UNIVERSAL)
+		gpio_set(gpio->gpio_tms);
+		gpio_set(gpio->gpio_tdi);
 #endif
+	}
 
-#if (defined HACKRF_ONE || defined PRALINE)
-	/* Do not drive PortaPack-specific TMS pin initially, just to be cautious. */
-	gpio_input(gpio->gpio_pp_tms);
-	gpio_input(gpio->gpio_pp_tdo);
+	switch (board_id) {
+	case BOARD_ID_HACKRF1_OG:
+	case BOARD_ID_HACKRF1_R9:
+	case BOARD_ID_PRALINE:
+#if defined(HACKRF_ONE) || defined(PRALINE) || defined(UNIVERSAL)
+		/* Do not drive PortaPack-specific TMS pin initially, just to be cautious. */
+		gpio_input(gpio->gpio_pp_tms);
+		gpio_input(gpio->gpio_pp_tdo);
 #endif
+		break;
+	default:
+		break;
+	}
 	gpio_output(gpio->gpio_tck);
-#ifndef PRALINE
-	gpio_output(gpio->gpio_tms);
-	gpio_output(gpio->gpio_tdi);
-	gpio_input(gpio->gpio_tdo);
+	if (board_id != BOARD_ID_PRALINE) {
+#if !defined(PRALINE) || defined(UNIVERSAL)
+		gpio_output(gpio->gpio_tms);
+		gpio_output(gpio->gpio_tdi);
+		gpio_input(gpio->gpio_tdo);
 #endif
+	}
 }
 
 void cpld_jtag_release(jtag_t* const jtag)
 {
 	const jtag_gpio_t* const gpio = jtag->gpio;
 
+	board_id_t board_id = detected_platform();
+
 	/* Make all pins inputs when JTAG interface not active.
 	 * Let the pull-ups/downs do the work.
 	 */
-#if (defined HACKRF_ONE || defined PRALINE)
-	/* Do not drive PortaPack-specific pins, initially, just to be cautious. */
-	gpio_input(gpio->gpio_pp_tms);
-	gpio_input(gpio->gpio_pp_tdo);
+	switch (board_id) {
+	case BOARD_ID_HACKRF1_OG:
+	case BOARD_ID_HACKRF1_R9:
+	case BOARD_ID_PRALINE:
+#if defined(HACKRF_ONE) || defined(PRALINE) || defined(UNIVERSAL)
+		/* Do not drive PortaPack-specific pins, initially, just to be cautious. */
+		gpio_input(gpio->gpio_pp_tms);
+		gpio_input(gpio->gpio_pp_tdo);
 #endif
+		break;
+	default:
+		break;
+	}
 	gpio_input(gpio->gpio_tck);
-#ifndef PRALINE
-	gpio_input(gpio->gpio_tms);
-	gpio_input(gpio->gpio_tdi);
-	gpio_input(gpio->gpio_tdo);
+	if (board_id != BOARD_ID_PRALINE) {
+#if !defined(PRALINE) || defined(UNIVERSAL)
+		gpio_input(gpio->gpio_tms);
+		gpio_input(gpio->gpio_tdi);
+		gpio_input(gpio->gpio_tdo);
 #endif
+	}
 }
 
-#ifndef PRALINE
+#if !defined(PRALINE) || defined(UNIVERSAL)
 /* return 0 if success else return error code see xsvfExecute() */
 int cpld_jtag_program(
 	jtag_t* const jtag,
@@ -111,4 +146,4 @@ unsigned char cpld_jtag_get_next_byte(void)
 	xsvf_pos++;
 	return byte;
 }
-#endif
+#endif

firmware/common/cpld_jtag.h

@@ -28,12 +28,12 @@
 
 typedef struct jtag_gpio_t {
 	gpio_t gpio_tck;
-#ifndef PRALINE
+#if !defined(PRALINE) || defined(UNIVERSAL)
 	gpio_t gpio_tms;
 	gpio_t gpio_tdi;
 	gpio_t gpio_tdo;
 #endif
-#if (defined HACKRF_ONE || defined PRALINE)
+#if defined(HACKRF_ONE) || defined(PRALINE) || defined(UNIVERSAL)
 	gpio_t gpio_pp_tms;
 	gpio_t gpio_pp_tdo;
 #endif

firmware/common/firmware_info.c

@@ -35,6 +35,9 @@
 	#define SUPPORTED_PLATFORM PLATFORM_RAD1O
 #elif PRALINE
 	#define SUPPORTED_PLATFORM PLATFORM_PRALINE
+#elif UNIVERSAL
+	#define SUPPORTED_PLATFORM \
+		(PLATFORM_PRALINE | PLATFORM_HACKRF1_OG | PLATFORM_HACKRF1_R9)
 #else
 	#define SUPPORTED_PLATFORM 0
 #endif

firmware/common/fpga_selftest.c

@@ -185,9 +185,9 @@ bool fpga_if_xcvr_selftest(void)
 	fpga_set_tx_nco_pstep(&fpga, 64);    // NCO phase increment
 	fpga_set_tx_nco_enable(&fpga, true); // TX enable
 	rf_path_set_direction(&rf_path, RF_PATH_DIRECTION_RX_CALIBRATION);
-	max2831_set_lna_gain(&max283x, 16);
-	max2831_set_vga_gain(&max283x, 36);
-	max2831_set_frequency(&max283x, 2500000000);
+	max283x_set_lna_gain(&max283x, 16);
+	max283x_set_vga_gain(&max283x, 36);
+	max283x_set_frequency(&max283x, 2500000000);
 
 	// Capture 1: 4 Msps, tone at 0.5 MHz, narrowband filter OFF
 	sample_rate_frac_set(4000000, 1);

firmware/common/gpio.h

@@ -25,7 +25,7 @@
 
 #include <stdbool.h>
 
-typedef const struct gpio_t* gpio_t;
+typedef const struct gpio* gpio_t;
 
 void gpio_init(void);
 void gpio_set(gpio_t gpio);

firmware/common/gpio_lpc.h

@@ -32,7 +32,7 @@
  * register #defines and API declarations into separate header files.
  */
 
-typedef struct gpio_port_t {
+typedef struct gpio_port {
 	volatile uint32_t dir; /* +0x000 */
 	uint32_t _reserved0[31];
 	volatile uint32_t mask; /* +0x080 */
@@ -48,7 +48,7 @@ typedef struct gpio_port_t {
 	volatile uint32_t inv; /* +0x300 */
 } gpio_port_t;
 
-struct gpio_t {
+struct gpio {
 	const uint32_t mask;
 	gpio_port_t* const port;
 	volatile uint32_t* const gpio_w;