diff options
| author | Kévin Redon <kredon@sysmocom.de> | 2019-09-24 18:36:55 +0200 |
|---|---|---|
| committer | laforge <laforge@osmocom.org> | 2019-10-04 15:55:02 +0000 |
| commit | e5efbb156c04964ceb294fe1f8b06433c4d7d761 (patch) | |
| tree | 964d69ecea80d7119267fe8f7d8d6319f44ac0cf /firmware | |
| parent | ede87e067dadd07119f24e96261b66ac92b3af6f (diff) | |
hw: put board specific pin definition in corresponding file
SIM_PWEN and VCC_FWD are signals specific to the simtrace boards.
the corresponding pins PA5 and PA26 are used for other signal
on the octsim-tester.
Change-Id: I51f37dd112cf681f4b1dbb3d2320ff9a697eaa08
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/libboard/common/include/board_common.h | 3 | ||||
| -rw-r--r-- | firmware/libboard/simtrace/include/board.h | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/firmware/libboard/common/include/board_common.h b/firmware/libboard/common/include/board_common.h index cb72d40..ded4762 100644 --- a/firmware/libboard/common/include/board_common.h +++ b/firmware/libboard/common/include/board_common.h @@ -112,9 +112,6 @@ /* Interrupt request ID of USART peripheral connected to the phone */ #define IRQ_USART_PHONE USART1_IRQn -#define SIM_PWEN PIO_PA5 -#define VCC_FWD PIO_PA26 - // Board has UDP controller #define BOARD_USB_UDP diff --git a/firmware/libboard/simtrace/include/board.h b/firmware/libboard/simtrace/include/board.h index 0c1e533..7703451 100644 --- a/firmware/libboard/simtrace/include/board.h +++ b/firmware/libboard/simtrace/include/board.h @@ -35,7 +35,7 @@ /* Button to force bootloader start (shorted to ground when pressed */ #define PIN_BOOTLOADER_SW {PIO_PA31, PIOA, ID_PIOA, PIO_INPUT, PIO_PULLUP} /* Enable powering the card using the second 3.3 V output of the LDO (active high) */ -#define SIM_PWEN_PIN {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT} +#define SIM_PWEN_PIN {PIO_PA5, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT} /* Enable powering the SIM card */ #define PWR_PINS SIM_PWEN_PIN /* Card presence pin */ @@ -93,9 +93,9 @@ /* Pins used to sniff phone-card communication */ #define PINS_SIM_SNIFF PIN_SIM_IO, PIN_SIM_CLK, PIN_SIM_RST_SNIFF /* Disable power converter 4.5-6V to 3.3V (active high) */ -#define PIN_SIM_PWEN_SNIFF {SIM_PWEN, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT} +#define PIN_SIM_PWEN_SNIFF {PIO_PA5, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT} /* Enable power switch to forward VCC_PHONE to VCC_SIM (active high) */ -#define PIN_VCC_FWD_SNIFF {VCC_FWD, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT} +#define PIN_VCC_FWD_SNIFF {PIO_PA26, PIOA, ID_PIOA, PIO_OUTPUT_1, PIO_DEFAULT} /* Use phone VCC to power card */ #define PINS_PWR_SNIFF PIN_SIM_PWEN_SNIFF, PIN_VCC_FWD_SNIFF |