LEON: various code-style cleanups

9 files changed, 38 insertions, 61 deletions

diff --git a/c/src/lib/libbsp/sparc/leon2/include/bsp.h b/c/src/lib/libbsp/sparc/leon2/include/bsp.h
index 9ec07b822f..09e7bb4e34 100644
--- a/c/src/lib/libbsp/sparc/leon2/include/bsp.h
+++ b/c/src/lib/libbsp/sparc/leon2/include/bsp.h
@@ -190,10 +190,10 @@ extern void BSP_shared_interrupt_mask(int irq);
  * for debugging and printing information about the system, but makes the
  * image bigger.
  */
-#define APBUART_INFO_AVAIL            /* APBUART Console driver */
+#define AMBAPPBUS_INFO_AVAIL          /* AMBAPP Bus driver */
 #define GPTIMER_INFO_AVAIL            /* GPTIMER Timer driver */
+#define GRETH_INFO_AVAIL              /* GRETH Ethernet driver */
 #define GRTC_RMAP_INFO_AVAIL          /* GRTC over SpaceWire/RMAP driver */
-#define AMBAPPBUS_INFO_AVAIL          /* AMBAPP Bus driver */
 
 #ifdef __cplusplus
 }
diff --git a/c/src/lib/libbsp/sparc/leon3/include/bsp.h b/c/src/lib/libbsp/sparc/leon3/include/bsp.h
index c2b5c20bce..e096f1e435 100644
--- a/c/src/lib/libbsp/sparc/leon3/include/bsp.h
+++ b/c/src/lib/libbsp/sparc/leon3/include/bsp.h
@@ -115,8 +115,6 @@ void bsp_spurious_initialize( void );
 /* Allocate 8-byte aligned non-freeable pre-malloc memory */
 void *bsp_early_malloc(int size);
 
-/*** Shared system interrupt handling ***/
-
 /* Interrupt Service Routine (ISR) pointer */
 typedef void (*bsp_shared_isr)(void *arg);
 
@@ -227,11 +225,11 @@ extern void bsp_watchdog_system_reset(void);
  * for debugging and printing information about the system, but makes the
  * image bigger.
  */
+#define AMBAPPBUS_INFO_AVAIL          /* AMBAPP Bus driver */
 #define APBUART_INFO_AVAIL            /* APBUART Console driver */
 #define GPTIMER_INFO_AVAIL            /* GPTIMER Timer driver */
-#define GRTC_RMAP_INFO_AVAIL          /* GRTC over SpaceWire/RMAP driver */
-#define AMBAPPBUS_INFO_AVAIL          /* AMBAPP Bus driver */
 #define GRETH_INFO_AVAIL              /* GRETH Ethernet driver */
+#define GRTC_RMAP_INFO_AVAIL          /* GRTC over SpaceWire/RMAP driver */
 
 #ifdef __cplusplus
 }
diff --git a/c/src/lib/libbsp/sparc/shared/a_bspgetworkarea.c b/c/src/lib/libbsp/sparc/shared/a_bspgetworkarea.c
deleted file mode 100644
index b22862642b..0000000000
--- a/c/src/lib/libbsp/sparc/shared/a_bspgetworkarea.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *  This set of routines are the BSP specific initialization
- *  support routines.
- *
- *  COPYRIGHT (c) 1989-2008.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- *
- *  $Id: bspgetworkarea.c,v 1.3 2008/12/18 21:10:04 joel Exp $
- */
-
-#include <bsp.h>
-#include <bsp/bootcard.h>
-
-/* Tells us where to put the workspace in case remote debugger is present.  */
-extern uint32_t rdb_start;
-
-/*
- *  This method returns the base address and size of the area which
- *  is to be allocated between the RTEMS Workspace and the C Program
- *  Heap.
- */
-void bsp_get_work_area(
-  void    **work_area_start,
-  ssize_t  *work_area_size,
-  void    **heap_start,
-  ssize_t  *heap_size
-)
-{
-  /* must be identical to STACK_SIZE in start.S */
-  #define STACK_SIZE (16 * 1024)
-
-  *work_area_start       = &end;
-  *work_area_size       = (void *)rdb_start - (void *)&end - STACK_SIZE;
-  *heap_start = BSP_BOOTCARD_HEAP_USES_WORK_AREA;
-  *heap_size = BSP_BOOTCARD_HEAP_SIZE_DEFAULT;
-}
diff --git a/c/src/lib/libbsp/sparc/shared/amba/ambapp_old.c b/c/src/lib/libbsp/sparc/shared/amba/ambapp_old.c
index c730173d31..1b543abde9 100644
--- a/c/src/lib/libbsp/sparc/shared/amba/ambapp_old.c
+++ b/c/src/lib/libbsp/sparc/shared/amba/ambapp_old.c
@@ -61,6 +61,13 @@ int ambapp_find_apbslvs(struct ambapp_bus *abus, int vendor, int device, struct
 	return ambapp_find_apbslvs_next(abus, vendor, device, dev, 0, maxno);
 }
 
+int ambapp_get_number_apbslv_devices(struct ambapp_bus *abus, int vendor, int device)
+{
+	return ambapp_dev_count(abus,
+			(OPTIONS_ALL|OPTIONS_APB_SLVS),
+			vendor, device);
+}
+
 int ambapp_find_ahbslvs_next(struct ambapp_bus *abus, int vendor, int device, struct ambapp_ahb_info *dev, int index, int maxno)
 {
 	struct ambapp_dev_find_match_arg arg;
@@ -90,3 +97,10 @@ int ambapp_find_ahbslvs(struct ambapp_bus *abus, int vendor, int device, struct
 {
 	return ambapp_find_ahbslvs_next(abus, vendor, device, dev, 0, maxno);
 }
+
+int ambapp_get_number_ahbslv_devices(struct ambapp_bus *abus, int vendor, int device)
+{
+	return ambapp_dev_count(abus,
+			(OPTIONS_ALL|OPTIONS_AHB_SLVS),
+			vendor, device);
+}
diff --git a/c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus_leon2.c b/c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus_leon2.c
index 14c63eab01..2e77e2a6d6 100644
--- a/c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus_leon2.c
+++ b/c/src/lib/libbsp/sparc/shared/drvmgr/ambapp_bus_leon2.c
@@ -76,8 +76,7 @@ struct ambapp_ops ambapp_leon2_ops = {
 	.get_params = ambapp_leon2_get_params
 };
 
-struct drvmgr_func ambapp_leon2_funcs[] =
-{
+struct drvmgr_func ambapp_leon2_funcs[] = {
 	DRVMGR_FUNC(AMBAPP_RW_ARG, ambapp_leon2_rw_arg),
 
 	DRVMGR_FUNC(AMBAPP_R8,  _ld8),
@@ -96,21 +95,18 @@ struct drvmgr_func ambapp_leon2_funcs[] =
 	DRVMGR_FUNC_END
 };
 
-struct drvmgr_drv_ops ambapp_ops = 
-{
+struct drvmgr_drv_ops ambapp_ops = {
 	.init = {ambapp_leon2_init1, ambapp_leon2_init2, NULL, NULL},
 	.remove = ambapp_leon2_remove,
 	.info = NULL,
 };
 
-struct leon2_amba_dev_id ambapp_leon2_ids[] = 
-{
+struct leon2_amba_dev_id ambapp_leon2_ids[] = {
 	{LEON2_AMBA_AMBAPP_ID},
 	{0}
 };
 
-struct leon2_amba_drv_info ambapp_bus_drv_leon2 = 
-{
+struct leon2_amba_drv_info ambapp_bus_drv_leon2 = {
 	{
 		DRVMGR_OBJ_DRV,			/* Driver */
 		NULL,				/* Next driver */
@@ -144,7 +140,7 @@ int ambapp_leon2_init1(struct drvmgr_dev *dev)
 
 	dev->name = "LEON2 AMBA PnP";
 
-	if ( !priv )
+	if (!priv)
 		return DRVMGR_NOMEM;
 
 	config = &priv->config;
@@ -164,7 +160,7 @@ int ambapp_leon2_init1(struct drvmgr_dev *dev)
 	/* Try to get Configuration from resource configuration */
 
 	value = drvmgr_dev_key_get(dev, "busFreq", KEY_TYPE_INT);
-	if ( value ) {
+	if (value) {
 		/* Set frequency of AMBA bus if specified by user. The frequency
 		 * must be for AHB bus which IOAREA matches (AHB bus 0).
 		 */
@@ -180,7 +176,7 @@ int ambapp_leon2_init1(struct drvmgr_dev *dev)
 	ambapp_freq_init(&priv->abus, NULL, freq_hz);
 
 	value = drvmgr_dev_key_get(dev, "drvRes", KEY_TYPE_POINTER);
-	if ( !value ) {
+	if (!value) {
 		DBG("ambapp_leon2_init1: Failed getting resource drvRes\n");
 		config->resources = NULL;
 	} else {
diff --git a/c/src/lib/libbsp/sparc/shared/include/ambapp.h b/c/src/lib/libbsp/sparc/shared/include/ambapp.h
index 9dc15f581c..6d9611a489 100644
--- a/c/src/lib/libbsp/sparc/shared/include/ambapp.h
+++ b/c/src/lib/libbsp/sparc/shared/include/ambapp.h
@@ -326,6 +326,11 @@ extern int ambapp_find_apbslvs(
 	struct ambapp_apb_info *dev,
 	int maxno);
 
+extern int ambapp_get_number_apbslv_devices(
+	struct ambapp_bus *abus,
+	int vendor,
+	int device);
+
 extern int ambapp_find_ahbslv(
 	struct ambapp_bus *abus,
 	int vendor,
@@ -354,6 +359,11 @@ extern int ambapp_find_ahbslvs(
 	struct ambapp_ahb_info *dev,
 	int maxno);
 
+extern int ambapp_get_number_ahbslv_devices(
+	struct ambapp_bus *abus,
+	int vendor,
+	int device);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/c/src/lib/libbsp/sparc/shared/include/occan.h b/c/src/lib/libbsp/sparc/shared/include/occan.h
index 9bc71f40a4..13d707d761 100644
--- a/c/src/lib/libbsp/sparc/shared/include/occan.h
+++ b/c/src/lib/libbsp/sparc/shared/include/occan.h
@@ -8,7 +8,6 @@
  *  http://www.rtems.com/license/LICENSE.
  *
  *  Author: Daniel Hellström, Gaisler Research AB, www.gaisler.com
- *
  */
 
 
diff --git a/c/src/lib/libbsp/sparc/shared/net/README b/c/src/lib/libbsp/sparc/shared/net/README
index db9f51def1..3ef086f223 100644
--- a/c/src/lib/libbsp/sparc/shared/net/README
+++ b/c/src/lib/libbsp/sparc/shared/net/README
@@ -4,4 +4,4 @@ version requires the driver manager.
 network_interface_add is used to assign IP/NETMASK and MAC address to
 GRETH interfaces dynamically according to in which order devices are
 registered. The function takes the settings from the user defined
-interface_configs[] array, normally defined in the project configuration.
+interface_configs[] array, defined in the project configuration.
diff --git a/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c b/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c
index 9b2e6f3037..ab57fba3d9 100644
--- a/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c
+++ b/c/src/lib/libbsp/sparc/shared/timer/tlib_ckinit.c
@@ -88,7 +88,7 @@ void Clock_isr(void *arg_unused)
 
 #else
 
-  /* 
+  /*
    * Add custom handling at every tick from bsp.h
    */
   Clock_driver_support_at_tick();
@@ -236,7 +236,7 @@ rtems_device_driver Clock_initialize(
   /*
    *  Register function called at system shutdown
    */
-  atexit( Clock_exit ); 
+  atexit( Clock_exit );
 
   /*
    * make major/minor avail to others such as shared memory driver