<p>Kévin Redon <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13058">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Kévin Redon: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">minor: rename MUX_SSTAT to MUX_STAT<br><br>Change-Id: I5eee17de31fdce92346641772fc0c63d4c37507a<br>---<br>M sysmoOCTSIM/atmel_start_config.atstart<br>M sysmoOCTSIM/atmel_start_pins.h<br>M sysmoOCTSIM/driver_init.c<br>3 files changed, 53 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sysmoOCTSIM/atmel_start_config.atstart b/sysmoOCTSIM/atmel_start_config.atstart</span><br><span>index 1bbad8f..290fa89 100644</span><br><span>--- a/sysmoOCTSIM/atmel_start_config.atstart</span><br><span>+++ b/sysmoOCTSIM/atmel_start_config.atstart</span><br><span>@@ -1481,11 +1481,11 @@</span><br><span> mode: Digital input</span><br><span> user_label: SWITCH</span><br><span> configuration: null</span><br><span style="color: hsl(0, 100%, 40%);">- MUX_SSTAT:</span><br><span style="color: hsl(120, 100%, 40%);">+ MUX_STAT:</span><br><span> name: PC15</span><br><span> definition: Atmel:SAME54_Drivers:0.0.1::SAME54N19A-AF::pad::PC15</span><br><span> mode: Digital input</span><br><span style="color: hsl(0, 100%, 40%);">- user_label: MUX_SSTAT</span><br><span style="color: hsl(120, 100%, 40%);">+ user_label: MUX_STAT</span><br><span> configuration: null</span><br><span> SIM1_IO:</span><br><span> name: PA16</span><br><span>diff --git a/sysmoOCTSIM/atmel_start_pins.h b/sysmoOCTSIM/atmel_start_pins.h</span><br><span>index 60b70bb..0264736 100644</span><br><span>--- a/sysmoOCTSIM/atmel_start_pins.h</span><br><span>+++ b/sysmoOCTSIM/atmel_start_pins.h</span><br><span>@@ -57,7 +57,7 @@</span><br><span> #define SIM2_INT GPIO(GPIO_PORTC, 2)</span><br><span> #define SIM3_INT GPIO(GPIO_PORTC, 3)</span><br><span> #define SWITCH GPIO(GPIO_PORTC, 14)</span><br><span style="color: hsl(0, 100%, 40%);">-#define MUX_SSTAT GPIO(GPIO_PORTC, 15)</span><br><span style="color: hsl(120, 100%, 40%);">+#define MUX_STAT GPIO(GPIO_PORTC, 15)</span><br><span> #define SIM6_IO GPIO(GPIO_PORTC, 16)</span><br><span> #define USER_LED GPIO(GPIO_PORTC, 26)</span><br><span> #define SCL4 GPIO(GPIO_PORTC, 27)</span><br><span>diff --git a/sysmoOCTSIM/driver_init.c b/sysmoOCTSIM/driver_init.c</span><br><span>index 5808f01..06184ee 100644</span><br><span>--- a/sysmoOCTSIM/driver_init.c</span><br><span>+++ b/sysmoOCTSIM/driver_init.c</span><br><span>@@ -702,6 +702,53 @@</span><br><span> </span><br><span> gpio_set_pin_function(SDA1, GPIO_PIN_FUNCTION_OFF);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ // GPIO on PB30</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_direction(UART_TX,</span><br><span style="color: hsl(120, 100%, 40%);">+ // <y> Pin direction</span><br><span style="color: hsl(120, 100%, 40%);">+ // <id> pad_direction</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_DIRECTION_OFF"> Off</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_DIRECTION_IN"> In</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_DIRECTION_OUT"> Out</span><br><span style="color: hsl(120, 100%, 40%);">+ GPIO_DIRECTION_OUT);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_level(UART_TX,</span><br><span style="color: hsl(120, 100%, 40%);">+ // <y> Initial level</span><br><span style="color: hsl(120, 100%, 40%);">+ // <id> pad_initial_level</span><br><span style="color: hsl(120, 100%, 40%);">+ // <false"> Low</span><br><span style="color: hsl(120, 100%, 40%);">+ // <true"> High</span><br><span style="color: hsl(120, 100%, 40%);">+ false);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_pull_mode(UART_TX,</span><br><span style="color: hsl(120, 100%, 40%);">+ // <y> Pull configuration</span><br><span style="color: hsl(120, 100%, 40%);">+ // <id> pad_pull_config</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_PULL_OFF"> Off</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_PULL_UP"> Pull-up</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_PULL_DOWN"> Pull-down</span><br><span style="color: hsl(120, 100%, 40%);">+ GPIO_PULL_OFF);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_function(UART_TX,</span><br><span style="color: hsl(120, 100%, 40%);">+ // <y> Pin function</span><br><span style="color: hsl(120, 100%, 40%);">+ // <id> pad_function</span><br><span style="color: hsl(120, 100%, 40%);">+ // <i> Auto : use driver pinmux if signal is imported by driver, else turn off function</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_PIN_FUNCTION_OFF"> Auto</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_PIN_FUNCTION_OFF"> Off</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_PIN_FUNCTION_A"> A</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_PIN_FUNCTION_B"> B</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_PIN_FUNCTION_C"> C</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_PIN_FUNCTION_D"> D</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_PIN_FUNCTION_E"> E</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_PIN_FUNCTION_F"> F</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_PIN_FUNCTION_G"> G</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_PIN_FUNCTION_H"> H</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_PIN_FUNCTION_I"> I</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_PIN_FUNCTION_J"> J</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_PIN_FUNCTION_K"> K</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_PIN_FUNCTION_L"> L</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_PIN_FUNCTION_M"> M</span><br><span style="color: hsl(120, 100%, 40%);">+ // <GPIO_PIN_FUNCTION_N"> N</span><br><span style="color: hsl(120, 100%, 40%);">+ GPIO_PIN_FUNCTION_H);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> // GPIO on PC00</span><br><span> </span><br><span> // Set pin direction to input</span><br><span>@@ -780,9 +827,9 @@</span><br><span> // GPIO on PC15</span><br><span> </span><br><span> // Set pin direction to input</span><br><span style="color: hsl(0, 100%, 40%);">- gpio_set_pin_direction(MUX_SSTAT, GPIO_DIRECTION_IN);</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_direction(MUX_STAT, GPIO_DIRECTION_IN);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gpio_set_pin_pull_mode(MUX_SSTAT,</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_pull_mode(MUX_STAT,</span><br><span> // <y> Pull configuration</span><br><span> // <id> pad_pull_config</span><br><span> // <GPIO_PULL_OFF"> Off</span><br><span>@@ -790,7 +837,7 @@</span><br><span> // <GPIO_PULL_DOWN"> Pull-down</span><br><span> GPIO_PULL_OFF);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- gpio_set_pin_function(MUX_SSTAT, GPIO_PIN_FUNCTION_OFF);</span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_function(MUX_STAT, GPIO_PIN_FUNCTION_OFF);</span><br><span> </span><br><span> // GPIO on PC26</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13058">change 13058</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13058"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ccid-firmware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5eee17de31fdce92346641772fc0c63d4c37507a </div>
<div style="display:none"> Gerrit-Change-Number: 13058 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Kévin Redon <kredon@sysmocom.de> </div>