Change in osmo-ccid-firmware[master]: minor: rename MUX_SSTAT to MUX_STAT

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

Kévin Redon gerrit-no-reply at lists.osmocom.org
Wed Feb 27 13:22:33 UTC 2019


Kévin Redon has submitted this change and it was merged. ( 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, 53 insertions(+), 6 deletions(-)

Approvals:
  Kévin Redon: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/sysmoOCTSIM/atmel_start_config.atstart b/sysmoOCTSIM/atmel_start_config.atstart
index 1bbad8f..290fa89 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
diff --git a/sysmoOCTSIM/atmel_start_pins.h b/sysmoOCTSIM/atmel_start_pins.h
index 60b70bb..0264736 100644
--- a/sysmoOCTSIM/atmel_start_pins.h
+++ b/sysmoOCTSIM/atmel_start_pins.h
@@ -57,7 +57,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 5808f01..06184ee 100644
--- a/sysmoOCTSIM/driver_init.c
+++ b/sysmoOCTSIM/driver_init.c
@@ -702,6 +702,53 @@
 
 	gpio_set_pin_function(SDA1, GPIO_PIN_FUNCTION_OFF);
 
+	// GPIO on PB30
+
+	gpio_set_pin_direction(UART_TX,
+	                       // <y> Pin direction
+	                       // <id> pad_direction
+	                       // <GPIO_DIRECTION_OFF"> Off
+	                       // <GPIO_DIRECTION_IN"> In
+	                       // <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
+	                       // <GPIO_PULL_OFF"> Off
+	                       // <GPIO_PULL_UP"> Pull-up
+	                       // <GPIO_PULL_DOWN"> Pull-down
+	                       GPIO_PULL_OFF);
+
+	gpio_set_pin_function(UART_TX,
+	                      // <y> Pin function
+	                      // <id> pad_function
+	                      // <i> Auto : use driver pinmux if signal is imported by driver, else turn off function
+	                      // <GPIO_PIN_FUNCTION_OFF"> Auto
+	                      // <GPIO_PIN_FUNCTION_OFF"> Off
+	                      // <GPIO_PIN_FUNCTION_A"> A
+	                      // <GPIO_PIN_FUNCTION_B"> B
+	                      // <GPIO_PIN_FUNCTION_C"> C
+	                      // <GPIO_PIN_FUNCTION_D"> D
+	                      // <GPIO_PIN_FUNCTION_E"> E
+	                      // <GPIO_PIN_FUNCTION_F"> F
+	                      // <GPIO_PIN_FUNCTION_G"> G
+	                      // <GPIO_PIN_FUNCTION_H"> H
+	                      // <GPIO_PIN_FUNCTION_I"> I
+	                      // <GPIO_PIN_FUNCTION_J"> J
+	                      // <GPIO_PIN_FUNCTION_K"> K
+	                      // <GPIO_PIN_FUNCTION_L"> L
+	                      // <GPIO_PIN_FUNCTION_M"> M
+	                      // <GPIO_PIN_FUNCTION_N"> N
+	                      GPIO_PIN_FUNCTION_H);
+
 	// GPIO on PC00
 
 	// Set pin direction to input
@@ -780,9 +827,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
@@ -790,7 +837,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: merged
Gerrit-Change-Id: I5eee17de31fdce92346641772fc0c63d4c37507a
Gerrit-Change-Number: 13058
Gerrit-PatchSet: 3
Gerrit-Owner: Kévin Redon <kredon at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
Gerrit-Reviewer: Kévin Redon <kredon at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190227/1128457d/attachment.htm>


More information about the gerrit-log mailing list