Skip to content

Commit 4e48230

Browse files
pradeep-grpradeep-gr
committed
To resolve conflict
1 parent b6e06bd commit 4e48230

26 files changed

+266
-494
lines changed

‎targets/TARGET_ONSEMI/TARGET_NCS36510/Pad.c‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
#ifdef REVD
21
/**
32
******************************************************************************
43
* @file pad.c
@@ -83,20 +82,20 @@ void fPadInit()
8382
PADREG->PADIO1.WORD = PAD_INPUT_PD_L1_PP; /* UART1 RXD */
8483
PADREG->PADIO2.WORD = PAD_INPUT_PD_L1_PP; /* UART1 CTS */
8584
PADREG->PADIO3.WORD = PAD_OUTPUT_PN_L1_OD; /* UART1 RTS */
86-
PADREG->PADIO4.WORD = PAD_UNUSED_PD_L0_PP;
87-
PADREG->PADIO5.WORD = PAD_UNUSED_PD_L0_PP;
88-
PADREG->PADIO6.WORD = PAD_UNUSED_PD_L0_PP;
89-
PADREG->PADIO7.WORD = PAD_UNUSED_PD_L0_PP;
85+
PADREG->PADIO4.WORD = PAD_UNUSED_PD_L1_PP;
86+
PADREG->PADIO5.WORD = PAD_UNUSED_PD_L1_PP;
87+
PADREG->PADIO6.WORD = PAD_UNUSED_PD_L1_PP;
88+
PADREG->PADIO7.WORD = PAD_UNUSED_PD_L1_PP;
9089
PADREG->PADIO8.WORD = PAD_OUTPUT_PN_L1_OD; /* UART2 TXD */
9190
PADREG->PADIO9.WORD = PAD_INPUT_PD_L1_PP; /* UART2 RXD */
92-
PADREG->PADIO10.WORD = PAD_UNUSED_PD_L0_PP;
91+
PADREG->PADIO10.WORD = PAD_UNUSED_PD_L1_PP;
9392
PADREG->PADIO11.WORD = PAD_INPUT_PD_L1_PP; /* SWO */
9493
PADREG->PADIO12.WORD = PAD_INPUT_PD_L1_PP; /* SWCLK */
9594
PADREG->PADIO13.WORD = PAD_INPUT_PD_L1_PP; /* SWDIO */
9695
PADREG->PADIO14.WORD = PAD_INPUT_PD_L1_PP;
97-
PADREG->PADIO15.WORD = PAD_UNUSED_PD_L0_PP;
98-
PADREG->PADIO16.WORD = PAD_UNUSED_PD_L0_PP;
99-
PADREG->PADIO17.WORD = PAD_UNUSED_PD_L0_PP;
96+
PADREG->PADIO15.WORD = PAD_UNUSED_PD_L1_PP;
97+
PADREG->PADIO16.WORD = PAD_UNUSED_PD_L1_PP;
98+
PADREG->PADIO17.WORD = PAD_UNUSED_PD_L1_PP;
10099

101100
/** - Disable the clock for PAD peripheral device */
102101
CLOCK_DISABLE(CLOCK_PAD);
@@ -142,5 +141,4 @@ boolean fPadIOCtrl(uint8_t PadNum, uint8_t OutputDriveStrength, uint8_t OutputDr
142141
}
143142
/* Invalid parameter/s */
144143
return False;
145-
}
146-
#endif /* REVD */
144+
}

‎targets/TARGET_ONSEMI/TARGET_NCS36510/device/TOOLCHAIN_IAR/startup_NCS36510.s‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -157,153 +157,153 @@ Reset_Handler
157157
BX R0
158158

159159
PUBWEAK NMI_Handler
160-
SECTION .text:CODE:REORDER(1)
160+
SECTION .text:CODE:REORDER:NOROOT(1)
161161
NMI_Handler
162162
B NMI_Handler
163163

164164
; PUBWEAK HardFault_Handler
165-
; SECTION .text:CODE:REORDER(1)
165+
; SECTION .text:CODE:REORDER:NOROOT(1)
166166
;HardFault_Handler
167167
; B HardFault_Handler
168168

169169
PUBWEAK MemManage_Handler
170-
SECTION .text:CODE:REORDER(1)
170+
SECTION .text:CODE:REORDER:NOROOT(1)
171171
MemManage_Handler
172172
B MemManage_Handler
173173

174174
PUBWEAK BusFault_Handler
175-
SECTION .text:CODE:REORDER(1)
175+
SECTION .text:CODE:REORDER:NOROOT(1)
176176
BusFault_Handler
177177
B BusFault_Handler
178178

179179
PUBWEAK UsageFault_Handler
180-
SECTION .text:CODE:REORDER(1)
180+
SECTION .text:CODE:REORDER:NOROOT(1)
181181
UsageFault_Handler
182182
B UsageFault_Handler
183183

184184
; PUBWEAK vPortSVCHandler
185-
; SECTION .text:CODE:REORDER(1)
185+
; SECTION .text:CODE:REORDER:NOROOT(1)
186186
;vPortSVCHandler
187187
; B vPortSVCHandler
188188

189189
PUBWEAK DebugMon_Handler
190-
SECTION .text:CODE:REORDER(1)
190+
SECTION .text:CODE:REORDER:NOROOT(1)
191191
DebugMon_Handler
192192
B DebugMon_Handler
193193

194194
; PUBWEAK xPortPendSVHandler
195-
; SECTION .text:CODE:REORDER(1)
195+
; SECTION .text:CODE:REORDER:NOROOT(1)
196196
;xPortPendSVHandler
197197
; B xPortPendSVHandler
198198

199199
; PUBWEAK SysTick_Handler
200-
; SECTION .text:CODE:REORDER(1)
200+
; SECTION .text:CODE:REORDER:NOROOT(1)
201201
;SysTick_Handler
202202
; B SysTick_Handler
203203

204204

205205
; PUBWEAK fIrqTim0Handler
206-
; SECTION .text:CODE:REORDER(1)
206+
; SECTION .text:CODE:REORDER:NOROOT(1)
207207
;fIrqTim0Handler
208208
; B fIrqTim0Handler
209209

210210
; PUBWEAK fIrqTim1Handler
211-
; SECTION .text:CODE:REORDER(1)
211+
; SECTION .text:CODE:REORDER:NOROOT(1)
212212
;fIrqTim1Handler
213213
; B fIrqTim1Handler
214214

215215
; PUBWEAK fIrqTim2Handler
216-
; SECTION .text:CODE:REORDER(1)
216+
; SECTION .text:CODE:REORDER:NOROOT(1)
217217
;fIrqTim2Handler
218218
; B fIrqTim2Handler
219219

220220
; PUBWEAK fIrqUart1Handler
221-
; SECTION .text:CODE:REORDER(1)
221+
; SECTION .text:CODE:REORDER:NOROOT(1)
222222
;fIrqUart1Handler
223223
; B fIrqUart1Handler
224224

225225
; PUBWEAK fIrqSpiHandler
226-
; SECTION .text:CODE:REORDER(1)
226+
; SECTION .text:CODE:REORDER:NOROOT(1)
227227
;fIrqSpiHandler
228228
; B fIrqSpiHandler
229229

230230
PUBWEAK fIrqI2CHandler
231-
SECTION .text:CODE:REORDER(1)
231+
SECTION .text:CODE:REORDER:NOROOT(1)
232232
fIrqI2CHandler
233233
B fIrqI2CHandler
234234

235235
; PUBWEAK fIrqGpioHandler
236-
; SECTION .text:CODE:REORDER(1)
236+
; SECTION .text:CODE:REORDER:NOROOT(1)
237237
;fIrqGpioHandler
238238
; B fIrqGpioHandler
239239

240240
PUBWEAK fIrqRtcHandler
241-
SECTION .text:CODE:REORDER(1)
241+
SECTION .text:CODE:REORDER:NOROOT(1)
242242
fIrqRtcHandler
243243
B fIrqRtcHandler
244244

245245
PUBWEAK fIrqFlashHandler
246-
SECTION .text:CODE:REORDER(1)
246+
SECTION .text:CODE:REORDER:NOROOT(1)
247247
fIrqFlashHandler
248248
B fIrqFlashHandler
249249

250250
PUBWEAK fIrqMacHwHandler
251-
SECTION .text:CODE:REORDER(1)
251+
SECTION .text:CODE:REORDER:NOROOT(1)
252252
fIrqMacHwHandler
253253
B fIrqMacHwHandler
254254

255255
PUBWEAK fIrqAesHandler
256-
SECTION .text:CODE:REORDER(1)
256+
SECTION .text:CODE:REORDER:NOROOT(1)
257257
fIrqAesHandler
258258
B fIrqAesHandler
259259

260260
PUBWEAK fIrqAdcHandler
261-
SECTION .text:CODE:REORDER(1)
261+
SECTION .text:CODE:REORDER:NOROOT(1)
262262
fIrqAdcHandler
263263
B fIrqAdcHandler
264264

265265
PUBWEAK fIrqClockCalHandler
266-
SECTION .text:CODE:REORDER(1)
266+
SECTION .text:CODE:REORDER:NOROOT(1)
267267
fIrqClockCalHandler
268268
B fIrqClockCalHandler
269269

270270
; PUBWEAK fIrqUart2Handler
271-
; SECTION .text:CODE:REORDER(1)
271+
; SECTION .text:CODE:REORDER:NOROOT(1)
272272
;fIrqUart2Handler
273273
; B fIrqUart2Handler
274274

275275
PUBWEAK fIrqDbgPwrUpHandler
276-
SECTION .text:CODE:REORDER(1)
276+
SECTION .text:CODE:REORDER:NOROOT(1)
277277
fIrqDbgPwrUpHandler
278278
B fIrqDbgPwrUpHandler
279279

280280
PUBWEAK fIrqDmaHandler
281-
SECTION .text:CODE:REORDER(1)
281+
SECTION .text:CODE:REORDER:NOROOT(1)
282282
fIrqDmaHandler
283283
B fIrqDmaHandler
284284

285285
PUBWEAK fIrqUviHandler
286-
SECTION .text:CODE:REORDER(1)
286+
SECTION .text:CODE:REORDER:NOROOT(1)
287287
fIrqUviHandler
288288
B fIrqUviHandler
289289

290290
PUBWEAK fIrqSpi2Handler
291-
SECTION .text:CODE:REORDER(1)
291+
SECTION .text:CODE:REORDER:NOROOT(1)
292292
fIrqSpi2Handler
293293
B fIrqSpi2Handler
294294

295295
PUBWEAK fIrqI2c2Handler
296-
SECTION .text:CODE:REORDER(1)
296+
SECTION .text:CODE:REORDER:NOROOT(1)
297297
fIrqI2c2Handler
298298
B fIrqI2c2Handler
299299

300300
PUBWEAK FIrqFVDDHCompHandler
301-
SECTION .text:CODE:REORDER(1)
301+
SECTION .text:CODE:REORDER:NOROOT(1)
302302
FIrqFVDDHCompHandler
303303
B FIrqFVDDHCompHandler
304304

305305
PUBWEAK DEF_IRQHandler
306-
SECTION .text:CODE:REORDER(1)
306+
SECTION .text:CODE:REORDER:NOROOT(1)
307307
DEF_IRQHandler
308308
B DEF_IRQHandler
309309

‎targets/TARGET_ONSEMI/TARGET_NCS36510/device/system_NCS36510.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
******************************************************************************/
2424

2525
#include <NCS36510.h>
26-
//#include "ncs36510Init.h" /* TODO */
26+
#include "ncs36510Init.h"
2727
/*----------------------------------------------------------------------------
2828
Define clocks
2929
*----------------------------------------------------------------------------*/

‎targets/TARGET_ONSEMI/TARGET_NCS36510/dma_map.h‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,6 @@
4747
**************************************************************************************************/
4848

4949
/** DMA control HW registers structure overlay */
50-
#ifdef REVB
51-
typedef struct {
52-
__IO uint32_t CONTROL; /**< Write 1 to enable DMA, write 0 to disable */
53-
__IO uint32_t SOURCE; /**< Address of source, read to get the number of bytes written */
54-
__IO uint32_t DESTINATION; /**< Address of destination, read to get the number of bytes written */
55-
__IO uint32_t SIZE; /**< Lenght of the entire transfer */
56-
__IO uint32_t STATUS; /**< To be debined */
57-
__IO uint32_t INT_ENABLE; /**< Enable interrupt source by writing 1. Bit 0: DMA done, Bit 1: Source Error, Bit 2: Destination Error */
58-
__IO uint32_t INT_CLEAR_ENABLE; /**< Clear Interrupt source by writing 1. Bit 0: DMA done, Bit 1: Source Error, Bit 2: Destination Error */
59-
__I uint32_t INT_STATUS; /**< Current interrupt status. Bit 0: DMA done, Bit 1: Source Error, Bit 2: Destination Error */
60-
} DmaReg_t, *DmaReg_pt;
61-
#endif /* REVB */
62-
#ifdef REVD
6350
typedef struct {
6451
union {
6552
struct {
@@ -104,5 +91,4 @@ typedef struct {
10491
__I uint32_t WORD;
10592
} INT_STATUS; /**< Interrupt status */
10693
} DmaReg_t, *DmaReg_pt;
107-
#endif /* REVD */
10894
#endif /* DMA_MAP_H_ */

‎targets/TARGET_ONSEMI/TARGET_NCS36510/macHw_map.h‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,7 @@ typedef struct {
131131
__O uint32_t FS:1;
132132
__O uint32_t FP:1;
133133
__O uint32_t FMD:1;
134-
#ifdef REVD
135134
__I uint32_t PC:1;
136-
#endif /* REVD */
137135
} BITS;
138136
__O uint32_t WORD;
139137
} CLEAR_IRQ; /**< 0x40014030 */
@@ -145,9 +143,7 @@ typedef struct {
145143
__IO uint32_t FS:1;
146144
__IO uint32_t FP:1;
147145
__IO uint32_t FM:1;
148-
#ifdef REVD
149146
__I uint32_t PC:1;
150-
#endif /* REVD */
151147
} BITS;
152148
__IO uint32_t WORD;
153149
} MASK_IRQ; /**< 0x40014034 */
@@ -159,9 +155,7 @@ typedef struct {
159155
__I uint32_t FS:1;
160156
__I uint32_t FP:1;
161157
__I uint32_t FM:1;
162-
#ifdef REVD
163158
__I uint32_t PC:1;
164-
#endif /* REVD */
165159
} BITS;
166160
__I uint32_t WORD;
167161
} IRQ_STATUS; /**< 0x40014038 */
@@ -202,9 +196,6 @@ typedef struct {
202196
__IO uint32_t WORD;
203197
} SLOT_OFFSET; /**< 0x40014064 */
204198
__I uint32_t TIME_STAMP; /**< 0x40014068 */
205-
#ifdef REVB
206-
__O uint32_t PAD5; /**< 0x4001406C */
207-
#endif /* REVB */
208199
union {
209200
struct {
210201
__IO uint32_t CRD_SHORT_ADDRESS:16;
@@ -214,17 +205,10 @@ typedef struct {
214205
__IO uint32_t PAN_COORD_ADDR_S:1;
215206
} BITS;
216207
__IO uint32_t WORD;
217-
#ifdef REVB
218-
} CRD_SHORT_ADDR; /**< 0x40014070 */
219-
__IO uint32_t CRD_LONG_ADDR_HI; /**< 0x40014074 */
220-
__IO uint32_t CRD_LONG_ADDR_LO; /**< 0x40014078 */
221-
#endif /* REVB */
222-
#ifdef REVD
223208
} CRD_SHORT_ADDR; /**< 0x4001406C */
224209
__IO uint32_t CRD_LONG_ADDR_HI; /**< 0x40014070 */
225210
__IO uint32_t CRD_LONG_ADDR_LO; /**< 0x40014074 */
226211
__O uint32_t PAD5; /**< 0x40014078 */
227-
#endif /* REVD */
228212
__O uint32_t PAD9; /**< 0x4001407C */
229213
__O uint32_t PAD10; /**< 0x40014080 */
230214
__O uint32_t PAD11; /**< 0x40014084 */

‎targets/TARGET_ONSEMI/TARGET_NCS36510/ncs36510_trng.h‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/**
2+
******************************************************************************
3+
* @file ncs36510_trng.h
4+
* @brief Header file for ncs36510_trng_api.c.
5+
* @internal
6+
* @author ON Semiconductor.
7+
* $Rev: $
8+
* $Date: $
9+
******************************************************************************
10+
* Copyright 2016 Semiconductor Components Industries LLC (d/b/a “ON Semiconductor”).
11+
* All rights reserved. This software and/or documentation is licensed by ON Semiconductor
12+
* under limited terms and conditions. The terms and conditions pertaining to the software
13+
* and/or documentation are available at http://www.onsemi.com/site/pdf/ONSEMI_T&C.pdf
14+
* (“ON Semiconductor Standard Terms and Conditions of Sale, Section 8 Software”) and
15+
* if applicable the software license agreement. Do not use this software and/or
16+
* documentation unless you have carefully read and you agree to the limited terms and
17+
* conditions. By using this software and/or documentation, you agree to the limited
18+
* terms and conditions.
19+
*
20+
* THIS SOFTWARE IS PROVIDED "AS IS". NO WARRANTIES, WHETHER EXPRESS, IMPLIED
21+
* OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF
22+
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE APPLY TO THIS SOFTWARE.
23+
* ON SEMICONDUCTOR SHALL NOT, IN ANY CIRCUMSTANCES, BE LIABLE FOR SPECIAL,
24+
* INCIDENTAL, OR CONSEQUENTIAL DAMAGES, FOR ANY REASON WHATSOEVER.
25+
* @endinternal
26+
*
27+
* @ingroup TRNG header
28+
*
29+
*/
30+
31+
#ifndef RANDOM_H_
32+
#define RANDOM_H_
33+
34+
#define TRNG_SLOW_MODE 0
35+
#define TRNG_FAST_MODE 1
36+
37+
#define TRNG_DISABLE 0
38+
#define TRNG_ENABLE 1
39+
40+
#define TRNG_ON_READ_EVENT 1
41+
42+
#endif /* RANDOM_H_ */

0 commit comments

Comments
 (0)