Kévin Redon has uploaded this change for review. (
https://gerrit.osmocom.org/13058
Change subject: minor: rename MUX_SSTAT to MUX_STAT
......................................................................
minor: rename MUX_SSTAT to MUX_STAT
Change-Id: I5eee17de31fdce92346641772fc0c63d4c37507a
---
M sysmoOCTSIM/atmel_start_config.atstart
M sysmoOCTSIM/atmel_start_pins.h
M sysmoOCTSIM/driver_init.c
3 files changed, 31 insertions(+), 23 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware
refs/changes/58/13058/1
diff --git a/sysmoOCTSIM/atmel_start_config.atstart
b/sysmoOCTSIM/atmel_start_config.atstart
index a5b73bd..948d1fb 100644
--- a/sysmoOCTSIM/atmel_start_config.atstart
+++ b/sysmoOCTSIM/atmel_start_config.atstart
@@ -1481,11 +1481,11 @@
mode: Digital input
user_label: SWITCH
configuration: null
- MUX_SSTAT:
+ MUX_STAT:
name: PC15
definition: Atmel:SAME54_Drivers:0.0.1::SAME54N19A-AF::pad::PC15
mode: Digital input
- user_label: MUX_SSTAT
+ user_label: MUX_STAT
configuration: null
SIM1_IO:
name: PA16
@@ -1571,6 +1571,16 @@
mode: Digital output
user_label: SDA4
configuration: null
+ UART_TX:
+ name: PB30
+ definition: Atmel:SAME54_Drivers:0.0.1::SAME54N19A-AF::pad::PB30
+ mode: Advanced
+ user_label: UART_TX
+ configuration:
+ pad_direction: Out
+ pad_function: H
+ pad_initial_level: Low
+ pad_pull_config: 'Off'
SCL2:
name: PB02
definition: Atmel:SAME54_Drivers:0.0.1::SAME54N19A-AF::pad::PB02
@@ -1583,14 +1593,4 @@
mode: Digital output
user_label: SDA2
configuration: null
- UART_TX:
- name: PB30
- definition: Atmel:SAME54_Drivers:0.0.1::SAME54N19A-AF::pad::PB30
- mode: Advanced
- user_label: UART_TX
- configuration:
- pad_direction: Out
- pad_function: H
- pad_initial_level: Low
- pad_pull_config: 'Off'
toolchain_options: []
diff --git a/sysmoOCTSIM/atmel_start_pins.h b/sysmoOCTSIM/atmel_start_pins.h
index a2a4206..c6492fa 100644
--- a/sysmoOCTSIM/atmel_start_pins.h
+++ b/sysmoOCTSIM/atmel_start_pins.h
@@ -58,7 +58,7 @@
#define SIM2_INT GPIO(GPIO_PORTC, 2)
#define SIM3_INT GPIO(GPIO_PORTC, 3)
#define SWITCH GPIO(GPIO_PORTC, 14)
-#define MUX_SSTAT GPIO(GPIO_PORTC, 15)
+#define MUX_STAT GPIO(GPIO_PORTC, 15)
#define SIM6_IO GPIO(GPIO_PORTC, 16)
#define USER_LED GPIO(GPIO_PORTC, 26)
#define SCL4 GPIO(GPIO_PORTC, 27)
diff --git a/sysmoOCTSIM/driver_init.c b/sysmoOCTSIM/driver_init.c
index f442359..d6eb401 100644
--- a/sysmoOCTSIM/driver_init.c
+++ b/sysmoOCTSIM/driver_init.c
@@ -708,6 +708,14 @@
// <true"> High
false);
+ gpio_set_pin_pull_mode(RMII_CLOCK,
+ // <y> Pull configuration
+ // <id> pad_pull_config
+ // <GPIO_PULL_OFF"> Off
+ // <GPIO_PULL_UP"> Pull-up
+ // <GPIO_PULL_DOWN"> Pull-down
+ GPIO_PULL_OFF);
+
gpio_set_pin_function(RMII_CLOCK,
// <y> Pin function
// <id> pad_function
@@ -768,6 +776,13 @@
// <GPIO_DIRECTION_OUT"> Out
GPIO_DIRECTION_OUT);
+ gpio_set_pin_level(UART_TX,
+ // <y> Initial level
+ // <id> pad_initial_level
+ // <false"> Low
+ // <true"> High
+ false);
+
gpio_set_pin_pull_mode(UART_TX,
// <y> Pull configuration
// <id> pad_pull_config
@@ -776,13 +791,6 @@
// <GPIO_PULL_DOWN"> Pull-down
GPIO_PULL_OFF);
- gpio_set_pin_level(UART_TX,
- // <y> Initial level
- // <id> pad_initial_level
- // <false"> Low
- // <true"> High
- false);
-
gpio_set_pin_function(UART_TX,
// <y> Pin function
// <id> pad_function
@@ -883,9 +891,9 @@
// GPIO on PC15
// Set pin direction to input
- gpio_set_pin_direction(MUX_SSTAT, GPIO_DIRECTION_IN);
+ gpio_set_pin_direction(MUX_STAT, GPIO_DIRECTION_IN);
- gpio_set_pin_pull_mode(MUX_SSTAT,
+ gpio_set_pin_pull_mode(MUX_STAT,
// <y> Pull configuration
// <id> pad_pull_config
// <GPIO_PULL_OFF"> Off
@@ -893,7 +901,7 @@
// <GPIO_PULL_DOWN"> Pull-down
GPIO_PULL_OFF);
- gpio_set_pin_function(MUX_SSTAT, GPIO_PIN_FUNCTION_OFF);
+ gpio_set_pin_function(MUX_STAT, GPIO_PIN_FUNCTION_OFF);
// GPIO on PC26
--
To view, visit https://gerrit.osmocom.org/13058
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5eee17de31fdce92346641772fc0c63d4c37507a
Gerrit-Change-Number: 13058
Gerrit-PatchSet: 1
Gerrit-Owner: Kévin Redon <kre...@sysmocom.de>
