Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Integration Candidate 20200121 #132

Merged
merged 2 commits into from
Jan 27, 2020
Merged

Integration Candidate 20200121 #132

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
753a146
Fix #128: Do not directly use a literal for char* members
jphickey Jan 9, 2020
e0ec90f
Merge pull request #129 from nasa/fix-128-rtems-string-literal
skliper Jan 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions fsw/pc-rtems/src/cfe_psp_start.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,16 @@ rtems_driver_address_table rtems_ramdisk_io_ops =
rtems_id RtemsTimerId;

static unsigned char ethernet_address[6] = {0x00, 0x04, 0x9F, 0x00, 0x27, 0x61 };
static char net_name_str[] = "fxp1";
static char ip_addr_str[] = "10.0.2.17";
static char ip_netmask_str[] = "255.255.255.0";

static struct rtems_bsdnet_ifconfig netdriver_config = {
.name = "fxp1" /*RTEMS_BSP_NETWORK_DRIVER_NAME*/,
.attach = rtems_fxp_attach /*RTEMS_BSP_NETWORK_DRIVER_ATTACH*/,
.name = net_name_str,
.attach = rtems_fxp_attach,
.next = NULL,
.ip_address = "10.0.2.17",
.ip_netmask = "255.255.255.0",
.ip_address = ip_addr_str,
.ip_netmask = ip_netmask_str,
.hardware_address = ethernet_address
/* more options can follow */
};
Expand Down