Change in osmo-ccid-firmware[master]: name pin according to schematic

2019-02-07 Thread Kévin Redon
Kévin Redon has submitted this change and it was merged. ( 
https://gerrit.osmocom.org/12810 )

Change subject: name pin according to schematic
..

name pin according to schematic

Change-Id: I94a7f2216c288150b044a6190804f9b7247eb10c
---
M sysmoOCTSIM/atmel_start_config.atstart
M sysmoOCTSIM/atmel_start_pins.h
M sysmoOCTSIM/driver_init.c
M sysmoOCTSIM/main.c
4 files changed, 175 insertions(+), 7 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/sysmoOCTSIM/atmel_start_config.atstart 
b/sysmoOCTSIM/atmel_start_config.atstart
index 5c7cc2c..b6303f9 100644
--- a/sysmoOCTSIM/atmel_start_config.atstart
+++ b/sysmoOCTSIM/atmel_start_config.atstart
@@ -1030,6 +1030,46 @@
 configuration:
   usb_gclk_selection: Generic clock generator 1
 pads:
+  SIMCLK_20MHZ:
+name: PA11
+definition: Atmel:SAME54_Drivers:0.0.1::SAME54N19A-AF::pad::PA11
+mode: Advanced
+user_label: SIMCLK_20MHZ
+configuration:
+  pad_direction: Out
+  pad_function: M
+  pad_initial_level: Low
+  pad_pull_config: 'Off'
+  SWITCH:
+name: PC14
+definition: Atmel:SAME54_Drivers:0.0.1::SAME54N19A-AF::pad::PC14
+mode: Digital input
+user_label: SWITCH
+configuration: null
+  VB0:
+name: PA20
+definition: Atmel:SAME54_Drivers:0.0.1::SAME54N19A-AF::pad::PA20
+mode: Digital input
+user_label: VB0
+configuration: null
+  VB1:
+name: PA21
+definition: Atmel:SAME54_Drivers:0.0.1::SAME54N19A-AF::pad::PA21
+mode: Digital input
+user_label: VB1
+configuration: null
+  VB2:
+name: PA22
+definition: Atmel:SAME54_Drivers:0.0.1::SAME54N19A-AF::pad::PA22
+mode: Digital input
+user_label: VB2
+configuration: null
+  VB3:
+name: PA23
+definition: Atmel:SAME54_Drivers:0.0.1::SAME54N19A-AF::pad::PA23
+mode: Digital input
+user_label: VB3
+configuration: null
   USBUP_D_N:
 name: PA24
 definition: Atmel:SAME54_Drivers:0.0.1::SAME54N19A-AF::pad::PA24
@@ -1042,11 +1082,11 @@
 mode: Advanced
 user_label: USBUP_D_P
 configuration: null
-  LED_system:
+  USER_LED:
 name: PC26
 definition: Atmel:SAME54_Drivers:0.0.1::SAME54N19A-AF::pad::PC26
 mode: Digital output
-user_label: LED_system
+user_label: USER_LED
 configuration: null
   UART_TX:
 name: PB30
diff --git a/sysmoOCTSIM/atmel_start_pins.h b/sysmoOCTSIM/atmel_start_pins.h
index 884a562..fea4388 100644
--- a/sysmoOCTSIM/atmel_start_pins.h
+++ b/sysmoOCTSIM/atmel_start_pins.h
@@ -27,10 +27,16 @@
 #define GPIO_PIN_FUNCTION_M 12
 #define GPIO_PIN_FUNCTION_N 13

+#define SIMCLK_20MHZ GPIO(GPIO_PORTA, 11)
+#define VB0 GPIO(GPIO_PORTA, 20)
+#define VB1 GPIO(GPIO_PORTA, 21)
+#define VB2 GPIO(GPIO_PORTA, 22)
+#define VB3 GPIO(GPIO_PORTA, 23)
 #define USBUP_D_N GPIO(GPIO_PORTA, 24)
 #define USBUP_D_P GPIO(GPIO_PORTA, 25)
 #define UART_TX GPIO(GPIO_PORTB, 30)
 #define UART_RX GPIO(GPIO_PORTB, 31)
-#define LED_system GPIO(GPIO_PORTC, 26)
+#define SWITCH GPIO(GPIO_PORTC, 14)
+#define USER_LED GPIO(GPIO_PORTC, 26)

 #endif // ATMEL_START_PINS_H_INCLUDED
diff --git a/sysmoOCTSIM/driver_init.c b/sysmoOCTSIM/driver_init.c
index dea4ebc..4ab622f 100644
--- a/sysmoOCTSIM/driver_init.c
+++ b/sysmoOCTSIM/driver_init.c
@@ -176,9 +176,131 @@
 {
init_mcu();

+   // GPIO on PA11
+
+   gpio_set_pin_direction(SIMCLK_20MHZ,
+  //  Pin direction
+  //  pad_direction
+  //  Off
+  //  In
+  //  Out
+  GPIO_DIRECTION_OUT);
+
+   gpio_set_pin_level(SIMCLK_20MHZ,
+  //  Initial level
+  //  pad_initial_level
+  //  Low
+  //  High
+  false);
+
+   gpio_set_pin_pull_mode(SIMCLK_20MHZ,
+  //  Pull configuration
+  //  pad_pull_config
+  //  Off
+  //  Pull-up
+  //  Pull-down
+  GPIO_PULL_OFF);
+
+   gpio_set_pin_function(SIMCLK_20MHZ,
+ //  Pin function
+ //  pad_function
+ //  Auto : use driver pinmux if signal is 
imported by driver, else turn off function
+ //  Auto
+ //  Off
+ //  A
+ //  B
+ //  C
+ //  D
+ //  E
+ //  F
+ //  G
+ //  H
+ //  I
+   

Change in osmo-ccid-firmware[master]: name pin according to schematic

2019-02-04 Thread Harald Welte
Harald Welte has posted comments on this change. ( 
https://gerrit.osmocom.org/12810 )

Change subject: name pin according to schematic
..


Patch Set 1: Code-Review+2


--
To view, visit https://gerrit.osmocom.org/12810
To unsubscribe, or for help writing mail filters, visit 
https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ccid-firmware
Gerrit-Branch: master
Gerrit-MessageType: comment
Gerrit-Change-Id: I94a7f2216c288150b044a6190804f9b7247eb10c
Gerrit-Change-Number: 12810
Gerrit-PatchSet: 1
Gerrit-Owner: Kévin Redon 
Gerrit-Reviewer: Harald Welte 
Gerrit-Comment-Date: Mon, 04 Feb 2019 14:21:18 +
Gerrit-HasComments: No
Gerrit-HasLabels: Yes