<p>Kévin Redon has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13058">View Change</a></p><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, 31 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/58/13058/1</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 a5b73bd..948d1fb 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>@@ -1571,6 +1571,16 @@</span><br><span> mode: Digital output</span><br><span> user_label: SDA4</span><br><span> configuration: null</span><br><span style="color: hsl(120, 100%, 40%);">+ UART_TX:</span><br><span style="color: hsl(120, 100%, 40%);">+ name: PB30</span><br><span style="color: hsl(120, 100%, 40%);">+ definition: Atmel:SAME54_Drivers:0.0.1::SAME54N19A-AF::pad::PB30</span><br><span style="color: hsl(120, 100%, 40%);">+ mode: Advanced</span><br><span style="color: hsl(120, 100%, 40%);">+ user_label: UART_TX</span><br><span style="color: hsl(120, 100%, 40%);">+ configuration:</span><br><span style="color: hsl(120, 100%, 40%);">+ pad_direction: Out</span><br><span style="color: hsl(120, 100%, 40%);">+ pad_function: H</span><br><span style="color: hsl(120, 100%, 40%);">+ pad_initial_level: Low</span><br><span style="color: hsl(120, 100%, 40%);">+ pad_pull_config: 'Off'</span><br><span> SCL2:</span><br><span> name: PB02</span><br><span> definition: Atmel:SAME54_Drivers:0.0.1::SAME54N19A-AF::pad::PB02</span><br><span>@@ -1583,14 +1593,4 @@</span><br><span> mode: Digital output</span><br><span> user_label: SDA2</span><br><span> configuration: null</span><br><span style="color: hsl(0, 100%, 40%);">- UART_TX:</span><br><span style="color: hsl(0, 100%, 40%);">- name: PB30</span><br><span style="color: hsl(0, 100%, 40%);">- definition: Atmel:SAME54_Drivers:0.0.1::SAME54N19A-AF::pad::PB30</span><br><span style="color: hsl(0, 100%, 40%);">- mode: Advanced</span><br><span style="color: hsl(0, 100%, 40%);">- user_label: UART_TX</span><br><span style="color: hsl(0, 100%, 40%);">- configuration:</span><br><span style="color: hsl(0, 100%, 40%);">- pad_direction: Out</span><br><span style="color: hsl(0, 100%, 40%);">- pad_function: H</span><br><span style="color: hsl(0, 100%, 40%);">- pad_initial_level: Low</span><br><span style="color: hsl(0, 100%, 40%);">- pad_pull_config: 'Off'</span><br><span> toolchain_options: []</span><br><span>diff --git a/sysmoOCTSIM/atmel_start_pins.h b/sysmoOCTSIM/atmel_start_pins.h</span><br><span>index a2a4206..c6492fa 100644</span><br><span>--- a/sysmoOCTSIM/atmel_start_pins.h</span><br><span>+++ b/sysmoOCTSIM/atmel_start_pins.h</span><br><span>@@ -58,7 +58,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 f442359..d6eb401 100644</span><br><span>--- a/sysmoOCTSIM/driver_init.c</span><br><span>+++ b/sysmoOCTSIM/driver_init.c</span><br><span>@@ -708,6 +708,14 @@</span><br><span> // <true"> High</span><br><span> false);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ gpio_set_pin_pull_mode(RMII_CLOCK,</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> gpio_set_pin_function(RMII_CLOCK,</span><br><span> // <y> Pin function</span><br><span> // <id> pad_function</span><br><span>@@ -768,6 +776,13 @@</span><br><span> // <GPIO_DIRECTION_OUT"> Out</span><br><span> GPIO_DIRECTION_OUT);</span><br><span> </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> gpio_set_pin_pull_mode(UART_TX,</span><br><span> // <y> Pull configuration</span><br><span> // <id> pad_pull_config</span><br><span>@@ -776,13 +791,6 @@</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_level(UART_TX,</span><br><span style="color: hsl(0, 100%, 40%);">- // <y> Initial level</span><br><span style="color: hsl(0, 100%, 40%);">- // <id> pad_initial_level</span><br><span style="color: hsl(0, 100%, 40%);">- // <false"> Low</span><br><span style="color: hsl(0, 100%, 40%);">- // <true"> High</span><br><span style="color: hsl(0, 100%, 40%);">- false);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> gpio_set_pin_function(UART_TX,</span><br><span> // <y> Pin function</span><br><span> // <id> pad_function</span><br><span>@@ -883,9 +891,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>@@ -893,7 +901,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: newchange </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: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>