Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
PolyORB-HI-C
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
6
Issues
6
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
TASTE
PolyORB-HI-C
Commits
bfda62a8
Commit
bfda62a8
authored
Jul 31, 2019
by
Thanassis Tsiodras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
More adaptations to make POHIC work with the latest RTEMS.
parent
2f6ef936
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
57 additions
and
6 deletions
+57
-6
include/po_hi_common.h
include/po_hi_common.h
+2
-2
src/drivers/config.c
src/drivers/config.c
+11
-0
src/drivers/config_leon3_drvmgr.c
src/drivers/config_leon3_drvmgr.c
+2
-2
src/drivers/config_leon4_n2x.c
src/drivers/config_leon4_n2x.c
+11
-1
src/drivers/po_hi_driver_leon_eth.c
src/drivers/po_hi_driver_leon_eth.c
+10
-0
src/drivers/po_hi_driver_rasta_common.c
src/drivers/po_hi_driver_rasta_common.c
+12
-1
src/drivers/po_hi_driver_rtems_drvmgr_ethernet.c
src/drivers/po_hi_driver_rtems_drvmgr_ethernet.c
+9
-0
No files found.
include/po_hi_common.h
View file @
bfda62a8
...
...
@@ -36,8 +36,8 @@
// #include <amba.h>
// #include <bsp/grspw.h>
// Things are always moving around in RTEMS.
//
Adapt... t
he latest RTEMS (2019/07) has restructured Leon/AMBA
// Things are always moving around in RTEMS
- adapt
.
//
T
he latest RTEMS (2019/07) has restructured Leon/AMBA
// headers under grlib. Detect this by a combination of checks,
// that depends on the fact that our custom cross build in TASTE
// enabled Ada (which Gaisler's RCC doesn't).
...
...
src/drivers/config.c
View file @
bfda62a8
...
...
@@ -20,7 +20,18 @@
/*#define LEON2_GRLIB*/
/* Configure Network if enabled */
#ifdef ENABLE_NETWORK
// Things are always moving around in RTEMS - adapt.
// The latest RTEMS (2019/07) has restructured Leon/AMBA
// headers under grlib. Detect this by a combination of checks,
// that depends on the fact that our custom cross build in TASTE
// enabled Ada (which Gaisler's RCC doesn't).
#if ((__RTEMS_ADA__ != 0) && (((__RTEMS_MAJOR__ << 8) | (__RTEMS_MINOR__ << 0)) >= 0x0500))
#include <grlib/network_interface_add.h>
#else
#include <bsp/network_interface_add.h>
#endif
//#include "networkconfig.h"
// Gaisler uses this file, user provided. for the moment, config done
...
...
src/drivers/config_leon3_drvmgr.c
View file @
bfda62a8
...
...
@@ -3,8 +3,8 @@
* Any modification there should be carefully weighted.
*/
// Things are always moving around in RTEMS.
//
Adapt... t
he latest RTEMS (2019/07) has restructured Leon/AMBA
// Things are always moving around in RTEMS
- adapt
.
//
T
he latest RTEMS (2019/07) has restructured Leon/AMBA
// headers under grlib. Detect this by a combination of checks,
// that depends on the fact that our custom cross build in TASTE
// enabled Ada (which Gaisler's RCC doesn't).
...
...
src/drivers/config_leon4_n2x.c
View file @
bfda62a8
#include <bsp/gr_leon4_n2x.h>
#include <drvmgr/ambapp_bus.h>
// Things are always moving around in RTEMS - adapt.
// The latest RTEMS (2019/07) has restructured Leon/AMBA
// headers under grlib. Detect this by a combination of checks,
// that depends on the fact that our custom cross build in TASTE
// enabled Ada (which Gaisler's RCC doesn't).
#if ((__RTEMS_ADA__ != 0) && (((__RTEMS_MAJOR__ << 8) | (__RTEMS_MINOR__ << 0)) >= 0x0500))
#include <grlib/ambapp_bus.h>
#else
#include <drvmgr/ambapp_bus.h>
#endif
/* GR-CPCI-LEON4-N2X boards configuration example. Note that this is
* optional, we only override defaults. If default are ok, nothing
...
...
src/drivers/po_hi_driver_leon_eth.c
View file @
bfda62a8
...
...
@@ -124,7 +124,17 @@ static struct rtems_bsdnet_ifconfig netdriver_config = {
0
/* Use default driver parameters */
};
#elif defined RTEMS412
// Things are always moving around in RTEMS - adapt.
// The latest RTEMS (2019/07) has restructured Leon/AMBA
// headers under grlib. Detect this by a combination of checks,
// that depends on the fact that our custom cross build in TASTE
// enabled Ada (which Gaisler's RCC doesn't).
#if ((__RTEMS_ADA__ != 0) && (((__RTEMS_MAJOR__ << 8) | (__RTEMS_MINOR__ << 0)) >= 0x0500))
#include <grlib/network_interface_add.h>
#else
#include <bsp/network_interface_add.h>
#endif
struct
ethernet_config
interface_configs
[]
=
{
...
...
src/drivers/po_hi_driver_rasta_common.c
View file @
bfda62a8
...
...
@@ -35,7 +35,18 @@
#include <ambapp.h>
#include <drvmgr/drvmgr.h>
#include <drvmgr/ambapp_bus_grlib.h>
#include <drvmgr/ambapp_bus.h>
// Things are always moving around in RTEMS - adapt.
// The latest RTEMS (2019/07) has restructured Leon/AMBA
// headers under grlib. Detect this by a combination of checks,
// that depends on the fact that our custom cross build in TASTE
// enabled Ada (which Gaisler's RCC doesn't).
#if ((__RTEMS_ADA__ != 0) && (((__RTEMS_MAJOR__ << 8) | (__RTEMS_MINOR__ << 0)) >= 0x0500))
#include <grlib/ambapp_bus.h>
#else
#include <drvmgr/ambapp_bus.h>
#endif
/* GRSPW0 resources */
struct
drvmgr_key
grlib_grspw0_res
[]
=
...
...
src/drivers/po_hi_driver_rtems_drvmgr_ethernet.c
View file @
bfda62a8
...
...
@@ -79,7 +79,16 @@ __po_hi_device_id leon_eth_device_id;
#include <bsp.h>
#include <rtems/rtems_bsdnet.h>
// Things are always moving around in RTEMS - adapt.
// The latest RTEMS (2019/07) has restructured Leon/AMBA
// headers under grlib. Detect this by a combination of checks,
// that depends on the fact that our custom cross build in TASTE
// enabled Ada (which Gaisler's RCC doesn't).
#if ((__RTEMS_ADA__ != 0) && (((__RTEMS_MAJOR__ << 8) | (__RTEMS_MINOR__ << 0)) >= 0x0500))
#include <grlib/network_interface_add.h>
#else
#include <bsp/network_interface_add.h>
#endif
#ifdef RTEMS_USE_LOOPBACK
/*
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment