summaryrefslogtreecommitdiff
path: root/nuttx/arch
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx/arch')
-rw-r--r--nuttx/arch/avr/src/at32uc3/at32uc3_internal.h31
-rw-r--r--nuttx/arch/avr/src/at32uc3/at32uc3_lowinit.c2
-rw-r--r--nuttx/arch/avr/src/at90usb/at90usb_internal.h33
-rw-r--r--nuttx/arch/avr/src/at90usb/at90usb_lowinit.c6
-rw-r--r--nuttx/arch/avr/src/atmega/atmega_internal.h29
-rw-r--r--nuttx/arch/avr/src/atmega/atmega_lowinit.c4
-rw-r--r--nuttx/arch/avr/src/avr/avr_internal.h2
-rw-r--r--nuttx/arch/avr/src/avr32/avr32_internal.h10
-rw-r--r--nuttx/arch/x86/src/common/up_internal.h11
-rw-r--r--nuttx/arch/x86/src/qemu/qemu_lowsetup.c4
10 files changed, 72 insertions, 60 deletions
diff --git a/nuttx/arch/avr/src/at32uc3/at32uc3_internal.h b/nuttx/arch/avr/src/at32uc3/at32uc3_internal.h
index 1601bd063..6d1c3abf0 100644
--- a/nuttx/arch/avr/src/at32uc3/at32uc3_internal.h
+++ b/nuttx/arch/avr/src/at32uc3/at32uc3_internal.h
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/avr/src/at32uc3/at32uc3_internal.h
*
- * Copyright (C) 2010 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2010, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -165,7 +165,8 @@
#undef EXTERN
#if defined(__cplusplus)
#define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
#else
#define EXTERN extern
#endif
@@ -182,7 +183,7 @@ extern "C" {
*
****************************************************************************/
-EXTERN void up_clkinitialize(void);
+void up_clkinitialize(void);
/****************************************************************************
* Name: usart_reset
@@ -192,7 +193,7 @@ EXTERN void up_clkinitialize(void);
*
****************************************************************************/
-EXTERN void usart_reset(uintptr_t usart_base);
+void usart_reset(uintptr_t usart_base);
/****************************************************************************
* Name: usart_configure
@@ -215,18 +216,18 @@ void usart_configure(uintptr_t usart_base, uint32_t baud, unsigned int parity,
*
****************************************************************************/
-EXTERN void up_consoleinit(void);
+void up_consoleinit(void);
/****************************************************************************
- * Name: up_boardinit
+ * Name: at32uc3_boardinitialize
*
* Description:
* This function must be provided by the board-specific logic in the
- * directory configs/<board-name>/up_boot.c.
+ * directory configs/<board-name>/src.
*
****************************************************************************/
-EXTERN void up_boardinitialize(void);
+void at32uc3_boardinitialize(void);
/****************************************************************************
* Name: at32uc3_configgpio
@@ -236,7 +237,7 @@ EXTERN void up_boardinitialize(void);
*
****************************************************************************/
-EXTERN int at32uc3_configgpio(uint16_t cfgset);
+int at32uc3_configgpio(uint16_t cfgset);
/****************************************************************************
* Name: at32uc3_gpiowrite
@@ -246,7 +247,7 @@ EXTERN int at32uc3_configgpio(uint16_t cfgset);
*
****************************************************************************/
-EXTERN void at32uc3_gpiowrite(uint16_t pinset, bool value);
+void at32uc3_gpiowrite(uint16_t pinset, bool value);
/****************************************************************************
* Name: at32uc3_gpioread
@@ -256,7 +257,7 @@ EXTERN void at32uc3_gpiowrite(uint16_t pinset, bool value);
*
****************************************************************************/
-EXTERN bool at32uc3_gpioread(uint16_t pinset);
+bool at32uc3_gpioread(uint16_t pinset);
/****************************************************************************
* Name: gpio_irqinitialize
@@ -277,7 +278,7 @@ EXTERN bool at32uc3_gpioread(uint16_t pinset);
****************************************************************************/
#ifdef CONFIG_AVR32_GPIOIRQ
-EXTERN void weak_function gpio_irqinitialize(void);
+void weak_function gpio_irqinitialize(void);
#endif
/****************************************************************************
@@ -295,7 +296,7 @@ EXTERN void weak_function gpio_irqinitialize(void);
****************************************************************************/
#ifdef CONFIG_AVR32_GPIOIRQ
-EXTERN int gpio_irqattach(int irq, xcpt_t newisr, xcpt_t *oldisr);
+int gpio_irqattach(int irq, xcpt_t newisr, xcpt_t *oldisr);
#endif
/****************************************************************************
@@ -313,7 +314,7 @@ EXTERN int gpio_irqattach(int irq, xcpt_t newisr, xcpt_t *oldisr);
****************************************************************************/
#ifdef CONFIG_AVR32_GPIOIRQ
-EXTERN void gpio_irqenable(int irq);
+void gpio_irqenable(int irq);
#endif
/*****************************************************************************
@@ -331,7 +332,7 @@ EXTERN void gpio_irqenable(int irq);
****************************************************************************/
#ifdef CONFIG_AVR32_GPIOIRQ
-EXTERN void gpio_irqdisable(int irq);
+void gpio_irqdisable(int irq);
#endif
#undef EXTERN
diff --git a/nuttx/arch/avr/src/at32uc3/at32uc3_lowinit.c b/nuttx/arch/avr/src/at32uc3/at32uc3_lowinit.c
index d1281491c..29dc0cb79 100644
--- a/nuttx/arch/avr/src/at32uc3/at32uc3_lowinit.c
+++ b/nuttx/arch/avr/src/at32uc3/at32uc3_lowinit.c
@@ -101,7 +101,7 @@ void up_lowinit(void)
/* Perform board-level initialization */
- up_boardinitialize();
+ at32uc3_boardinitialize();
}
diff --git a/nuttx/arch/avr/src/at90usb/at90usb_internal.h b/nuttx/arch/avr/src/at90usb/at90usb_internal.h
index 8e4dfc0e6..6c50fa78d 100644
--- a/nuttx/arch/avr/src/at90usb/at90usb_internal.h
+++ b/nuttx/arch/avr/src/at90usb/at90usb_internal.h
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/avr/src/at90usb/at90usb_internal.h
*
- * Copyright (C) 2011 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2011, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -71,7 +71,8 @@
#undef EXTERN
#if defined(__cplusplus)
#define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
#else
#define EXTERN extern
#endif
@@ -84,11 +85,11 @@ extern "C" {
* Name: up_clkinit
*
* Description:
- * Initialiaze clock/PLL settings per the definitions in the board.h file.
+ * Initialize clock/PLL settings per the definitions in the board.h file.
*
****************************************************************************/
-EXTERN void up_clkinitialize(void);
+void up_clkinitialize(void);
/****************************************************************************
* Name: usart1_reset
@@ -98,7 +99,7 @@ EXTERN void up_clkinitialize(void);
*
****************************************************************************/
-EXTERN void usart1_reset(void);
+void usart1_reset(void);
/****************************************************************************
* Name: usart1_configure
@@ -108,30 +109,30 @@ EXTERN void usart1_reset(void);
*
****************************************************************************/
-EXTERN void usart1_configure(void);
+void usart1_configure(void);
/****************************************************************************
* Name: up_consoleinit
*
* Description:
* Initialize a console for debug output. This function is called very
- * early in the initializeation sequence to configure the serial console
- * uart (only).
+ * early in the initialization sequence to configure the serial console
+ * UART (only).
*
****************************************************************************/
-EXTERN void up_consoleinit(void);
+void up_consoleinit(void);
/****************************************************************************
- * Name: up_boardinit
+ * Name: at90usb_boardinitialize
*
* Description:
* This function must be provided by the board-specific logic in the
- * directory configs/<board-name>/up_boot.c.
+ * directory configs/<board-name>/src/.
*
****************************************************************************/
-EXTERN void up_boardinitialize(void);
+void at90usb_boardinitialize(void);
/****************************************************************************
* Name: gpio_irqinitialize
@@ -150,7 +151,7 @@ EXTERN void up_boardinitialize(void);
****************************************************************************/
#ifdef CONFIG_AVR_GPIOIRQ
-EXTERN void weak_function gpio_irqinitialize(void);
+void weak_function gpio_irqinitialize(void);
#endif
/****************************************************************************
@@ -166,7 +167,7 @@ EXTERN void weak_function gpio_irqinitialize(void);
****************************************************************************/
#ifdef CONFIG_AVR_GPIOIRQ
-EXTERN int gpio_irqattach(int irq, xcpt_t newisr, xcpt_t *oldisr);
+int gpio_irqattach(int irq, xcpt_t newisr, xcpt_t *oldisr);
#endif
/****************************************************************************
@@ -182,7 +183,7 @@ EXTERN int gpio_irqattach(int irq, xcpt_t newisr, xcpt_t *oldisr);
****************************************************************************/
#ifdef CONFIG_AVR_GPIOIRQ
-EXTERN void gpio_irqenable(int irq);
+void gpio_irqenable(int irq);
#endif
/*****************************************************************************
@@ -198,7 +199,7 @@ EXTERN void gpio_irqenable(int irq);
****************************************************************************/
#ifdef CONFIG_AVR_GPIOIRQ
-EXTERN void gpio_irqdisable(int irq);
+void gpio_irqdisable(int irq);
#endif
#undef EXTERN
diff --git a/nuttx/arch/avr/src/at90usb/at90usb_lowinit.c b/nuttx/arch/avr/src/at90usb/at90usb_lowinit.c
index 89de8b8ca..68a8d1f34 100644
--- a/nuttx/arch/avr/src/at90usb/at90usb_lowinit.c
+++ b/nuttx/arch/avr/src/at90usb/at90usb_lowinit.c
@@ -1,7 +1,7 @@
/**************************************************************************
* arch/avr/src/at90usb/at90usb_lowinit.c
*
- * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2011-2012, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -148,7 +148,5 @@ void up_lowinit(void)
/* Perform board-level initialization */
- up_boardinitialize();
+ at90usb_boardinitialize();
}
-
-
diff --git a/nuttx/arch/avr/src/atmega/atmega_internal.h b/nuttx/arch/avr/src/atmega/atmega_internal.h
index 007b42425..e776cc3c0 100644
--- a/nuttx/arch/avr/src/atmega/atmega_internal.h
+++ b/nuttx/arch/avr/src/atmega/atmega_internal.h
@@ -71,7 +71,8 @@
#undef EXTERN
#if defined(__cplusplus)
#define EXTERN extern "C"
-extern "C" {
+extern "C"
+{
#else
#define EXTERN extern
#endif
@@ -88,7 +89,7 @@ extern "C" {
*
****************************************************************************/
-EXTERN void up_clkinitialize(void);
+void up_clkinitialize(void);
/****************************************************************************
* Name: usart0_reset and usart1_reset
@@ -98,8 +99,8 @@ EXTERN void up_clkinitialize(void);
*
****************************************************************************/
-EXTERN void usart0_reset(void);
-EXTERN void usart1_reset(void);
+void usart0_reset(void);
+void usart1_reset(void);
/****************************************************************************
* Name: usart0_configure and usart1_configure
@@ -109,8 +110,8 @@ EXTERN void usart1_reset(void);
*
****************************************************************************/
-EXTERN void usart0_configure(void);
-EXTERN void usart1_configure(void);
+void usart0_configure(void);
+void usart1_configure(void);
/****************************************************************************
* Name: up_consoleinit
@@ -122,18 +123,18 @@ EXTERN void usart1_configure(void);
*
****************************************************************************/
-EXTERN void up_consoleinit(void);
+void up_consoleinit(void);
/****************************************************************************
- * Name: up_boardinit
+ * Name: atmega_boardinitialize
*
* Description:
* This function must be provided by the board-specific logic in the
- * directory configs/<board-name>/up_boot.c.
+ * directory configs/<board-name>/src.
*
****************************************************************************/
-EXTERN void up_boardinitialize(void);
+void atmega_boardinitialize(void);
/****************************************************************************
* Name: gpio_irqinitialize
@@ -152,7 +153,7 @@ EXTERN void up_boardinitialize(void);
****************************************************************************/
#ifdef CONFIG_AVR_GPIOIRQ
-EXTERN void weak_function gpio_irqinitialize(void);
+void weak_function gpio_irqinitialize(void);
#endif
/****************************************************************************
@@ -168,7 +169,7 @@ EXTERN void weak_function gpio_irqinitialize(void);
****************************************************************************/
#ifdef CONFIG_AVR_GPIOIRQ
-EXTERN int gpio_irqattach(int irq, xcpt_t newisr, xcpt_t *oldisr);
+int gpio_irqattach(int irq, xcpt_t newisr, xcpt_t *oldisr);
#endif
/****************************************************************************
@@ -184,7 +185,7 @@ EXTERN int gpio_irqattach(int irq, xcpt_t newisr, xcpt_t *oldisr);
****************************************************************************/
#ifdef CONFIG_AVR_GPIOIRQ
-EXTERN void gpio_irqenable(int irq);
+void gpio_irqenable(int irq);
#endif
/*****************************************************************************
@@ -200,7 +201,7 @@ EXTERN void gpio_irqenable(int irq);
****************************************************************************/
#ifdef CONFIG_AVR_GPIOIRQ
-EXTERN void gpio_irqdisable(int irq);
+void gpio_irqdisable(int irq);
#endif
#undef EXTERN
diff --git a/nuttx/arch/avr/src/atmega/atmega_lowinit.c b/nuttx/arch/avr/src/atmega/atmega_lowinit.c
index 0acd08422..8987ea25e 100644
--- a/nuttx/arch/avr/src/atmega/atmega_lowinit.c
+++ b/nuttx/arch/avr/src/atmega/atmega_lowinit.c
@@ -1,7 +1,7 @@
/**************************************************************************
* arch/avr/src/atmega/atmega_lowinit.c
*
- * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2011-2012, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -153,7 +153,7 @@ void up_lowinit(void)
/* Perform board-level initialization */
- up_boardinitialize();
+ atmega_boardinitialize();
}
diff --git a/nuttx/arch/avr/src/avr/avr_internal.h b/nuttx/arch/avr/src/avr/avr_internal.h
index f74d682e5..b0b8dba96 100644
--- a/nuttx/arch/avr/src/avr/avr_internal.h
+++ b/nuttx/arch/avr/src/avr/avr_internal.h
@@ -146,7 +146,7 @@ uint8_t *up_doirq(uint8_t irq, uint8_t *regs);
* including up_spiinitialize()) are provided by common LPC17xx logic. To use
* this common SPI logic on your board:
*
- * 1. Provide logic in up_boardinitialize() to configure SPI chip select
+ * 1. Provide logic in <arch>_boardinitialize() to configure SPI chip select
* pins.
* 2. Provide avr_spiselect() and avr_spistatus() functions in your board-specific
* logic. These functions will perform chip selection and status operations
diff --git a/nuttx/arch/avr/src/avr32/avr32_internal.h b/nuttx/arch/avr/src/avr32/avr32_internal.h
index c98f0b5cc..14d9c8521 100644
--- a/nuttx/arch/avr/src/avr32/avr32_internal.h
+++ b/nuttx/arch/avr/src/avr32/avr32_internal.h
@@ -88,7 +88,7 @@ extern uint32_t g_idle_topstack;
****************************************************************************/
/****************************************************************************
- * Public Functions
+ * Public Function Prototypes
****************************************************************************/
#ifndef __ASSEMBLY__
@@ -102,7 +102,7 @@ extern uint32_t g_idle_topstack;
*
************************************************************************************/
-extern void up_copystate(uint32_t *dest, uint32_t *src);
+void up_copystate(uint32_t *dest, uint32_t *src);
/************************************************************************************
* Name: up_fullcontextrestore
@@ -112,7 +112,7 @@ extern void up_copystate(uint32_t *dest, uint32_t *src);
*
************************************************************************************/
-extern void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
+void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
/************************************************************************************
* Name: up_switchcontext
@@ -122,7 +122,7 @@ extern void up_fullcontextrestore(uint32_t *restoreregs) noreturn_function;
*
************************************************************************************/
-extern void up_switchcontext(uint32_t *saveregs, uint32_t *restoreregs);
+void up_switchcontext(uint32_t *saveregs, uint32_t *restoreregs);
/************************************************************************************
* Name: up_doirq
@@ -132,7 +132,7 @@ extern void up_switchcontext(uint32_t *saveregs, uint32_t *restoreregs);
*
************************************************************************************/
-extern uint32_t *up_doirq(int irq, uint32_t *regs);
+uint32_t *up_doirq(int irq, uint32_t *regs);
#endif /* __ASSEMBLY__ */
#endif /* __ARCH_AVR_SRC_AVR32_AVR32_INTERNAL_H */
diff --git a/nuttx/arch/x86/src/common/up_internal.h b/nuttx/arch/x86/src/common/up_internal.h
index c38d9e131..147c186ba 100644
--- a/nuttx/arch/x86/src/common/up_internal.h
+++ b/nuttx/arch/x86/src/common/up_internal.h
@@ -179,6 +179,17 @@ extern uint32_t _ebss; /* End+1 of .bss */
#ifndef __ASSEMBLY__
+/****************************************************************************
+ * Name: x86_boardinitialize
+ *
+ * Description:
+ * This function must be provided by the board-specific logic in the
+ * directory configs/<board-name>/src/.
+ *
+ ****************************************************************************/
+
+void x86_boardinitialize(void);
+
/* Defined in files with the same name as the function */
extern void up_boot(void);
diff --git a/nuttx/arch/x86/src/qemu/qemu_lowsetup.c b/nuttx/arch/x86/src/qemu/qemu_lowsetup.c
index db2b01ef5..439f4fcd5 100644
--- a/nuttx/arch/x86/src/qemu/qemu_lowsetup.c
+++ b/nuttx/arch/x86/src/qemu/qemu_lowsetup.c
@@ -1,7 +1,7 @@
/****************************************************************************
* arch/x86/src/qemu/qemu_lowsetup.c
*
- * Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
+ * Copyright (C) 2011-2012, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -135,6 +135,6 @@ void up_lowsetup(void)
/* Now perform board-specific initializations */
- up_boardinitialize();
+ x86_boardinitialize();
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-08 22:35:57 +0000