Commit Graph

347 Commits

Author SHA1 Message Date
Brendan Chandler
c606048e57 rtems_config: Change config options based on BSP name
This replaces an implementation that used a header guard being defined
to indicate BSP specific options.  Hopefully this method is more
explicit when config options should be set for specific BSPs.
2021-03-04 14:11:42 -06:00
Brendan Chandler
f69ff5afde rtems_config: Fix typo in #if statement 2021-03-04 14:11:32 -06:00
Brendan Chandler
102e30eaa9 rtems_config: Guard using __RTEMS_MAJOR__ rather than net stack 2021-03-03 17:02:03 -06:00
Brendan Chandler
75063a69ec RTEMS ne2kpci: clean up when its included
This looks like a merge issue, where we included ne2kpci possibly
twice, based on CPU being i386 and BSP being pc686.  Just
checking CPU as i386 should be sufficient for all cases.
2021-03-03 15:58:37 -06:00
Brendan Chandler
8e50b3109a Allow RTEMS to use normal dlopen() symbols
RTEMS supports POSIX dlopen related symbols, so we should allow using them.
2021-03-02 09:23:27 -06:00
Brendan Chandler
79242da515 epicPosicMutexInit: avoid calling with 0 which is platform dependent
Different platforms (RTEMS5) can define different values for
PTHREAD_MUTEX_DEFAULT, so we shouldn't pass 0 assuming its
PTHREAD_MUTEX_DEFAULT.
2021-02-28 20:07:33 -06:00
Brendan Chandler
11fedecefc Only write out dhcpcd.conf if it doesn't exist.
rtems_init.c will write out a dhcpcd.conf if one doesn't already
exist, but if there's a filesystem including this file, don't write
over it, use whatever's there instead.
2021-02-25 15:50:58 -06:00
Brendan Chandler
e2d37bc70d Merge branch '7.0' of https://github.com/epics-base/epics-base into rtems5 2021-02-25 14:06:41 -06:00
Brendan Chandler
35ec367eac Remove unused variable 2021-02-25 11:24:02 -06:00
Brendan Chandler
c4944b5357 Enable initializing the filesystem in RTEMS5 2021-02-25 11:23:26 -06:00
Brendan Chandler
2c29dd0c7e Fix merge error in osiSockTest.c 2021-02-22 17:32:57 -06:00
Brendan Chandler
9a8e56d83e Merge branch 'rtems5-dev' of github.com:brendanchandler/epics-base into rtems5-dev 2021-02-22 17:23:36 -06:00
Brendan Chandler
25b9655f60 RTEMS DHCP: Use safer versions of string functions
Use strtok_r rather than strtok

Use strlen() rather than harcoded string size.  GCC should optimize
this to the hardcoded string size, so the result should be the same
but maybe prevents future mistakes.

replace strncpy() with snprintf() to avoid issues with NULL terminated
strings.
2021-02-22 17:19:28 -06:00
Brendan Chandler
f5eb5033f2 osiSockTest: use strerror rather than strerror_r
Windows vsc19 and mingw on ubuntu were failing with this symbol.
2021-02-22 17:03:25 -06:00
Brendan Chandler
dc1bf9106e osiSockTest: Give a clearer error message if sendto() fails 2021-02-22 16:20:01 -06:00
Brendan Chandler
74fa27d316 Add commented code that starts an RTEMS shell, useful for debugging
In the future, it would be nice to add an ioc shell command to launch
into an RTEMS shell, but for now, it can be helpful when debugging to
enable this section for poking around in an RTEMS shell check network
configuration and stuff like that.
2021-02-22 16:18:00 -06:00
Brendan Chandler
3bdfb9ec45 Increase DHCP timeouts
RTEMS dhcp will wait indefinitely for a response.

rtems_init.c will wait on DHCP for 10 minutes, before timing out and
starting main().  Note that rtems should still be waiting in the
background and a dhcp connection could still come up after this timeout.
2021-02-22 16:11:50 -06:00
Brendan Chandler
a934570cce rtems dhcp: remove strncmp on environment vars in favor of strcmp 2021-02-22 16:08:18 -06:00
Michael Davidsaver
5593103c11 posix: epicsMutexShowAll() print if PI mutex are used
Confirms that pthread_mutex_t are actually being created
with PTHREAD_PRIO_INHERIT, ie. if both libc and kernel
support is present.
2021-02-21 20:01:45 -08:00
5a8b6e4111 posix: PI for epicsMutex, epicsEvent etc.
Enable priority-inheritance for primitives based on pthread_mutex_t.

Based on work by Till Straumann <till.straumann@psi.ch>
2021-02-21 20:01:45 -08:00
Andrew Johnson
9d0597fc15 Fix MS compiler issue that I introduced into Freddie's code
Plus a little more code simplification.
2021-02-21 12:04:07 -06:00
Andrew Johnson
93208af61c Merged Freddie Akeroyd's fix_win32_monotonic_time branch 2021-02-20 17:36:21 -06:00
Brendan Chandler
6965f86298 Change telnetd configuration to use defaults
Currently, this configuration doesn't seem to be used yet, but
regardless we'll update the settings to use RTEMS defaults.
2021-02-16 15:51:25 -06:00
Brendan Chandler
af88e9f6c6 Clean up a couple warnings in RTEMS code 2021-02-16 15:51:25 -06:00
Brendan Chandler
a309912c8b RTEMS DHCP: Use safer versions of string functions
Use strtok_r rather than strtok

Use strlen() rather than harcoded string size.  GCC should optimize
this to the hardcoded string size, so the result should be the same
but maybe prevents future mistakes.

replace strncpy() with snprintf() to avoid issues with NULL terminated
strings.
2021-02-16 15:51:06 -06:00
Brendan Chandler
3fd9ffc995 Include osdTime using compiler include path
Previously it was using a relative directory name, #included in the .c file.
2021-02-09 15:05:31 -06:00
Brendan Chandler
a8262573f5 Don't use or include mlock() on RTEMS 2021-02-09 14:28:11 -06:00
Brendan Chandler
e4b17bdab5 Remove local def of VERSION_INIT in favor of one from epicsVersion.h 2021-02-09 14:27:24 -06:00
Brendan Chandler
ea40041b45 Remove FHI specific information from NTP and bootp variable init 2021-02-09 14:26:26 -06:00
Brendan Chandler
6bf26782a0 Fix license comment in epicsNtp.c and .h 2021-02-09 14:25:55 -06:00
Andrew Johnson
36d0fbd7be Another c89 compat fix 2021-02-08 13:34:01 -06:00
Michael Davidsaver
30e1431fb4 c89 compat 2021-02-08 09:43:51 -08:00
Michael Davidsaver
745c3f552e Com: add epicsStrSimilarity() 2021-02-08 09:22:27 -08:00
Michael Davidsaver
8723d4d9cb include database S_* in error string table 2021-02-08 09:22:27 -08:00
Michael Ritzert
410921b5ef Use getifaddrs instead of SIOCGIFCONF.
The old code is preserved in osdNetIfConf.c, which is used by the default
platform directory.

Platforms that support getifaddrs use the new code from osdNetIfAddrs.c.
2021-02-06 08:27:21 -08:00
Brendan Chandler
188f46f74b Remove prototype definition of select() from osdSock.h 2021-02-05 14:26:02 -06:00
Brendan Chandler
518ac1d7c1 Remove define of bzero to use memset
As far as I can tell, we don't use bzero().
2021-02-05 14:01:12 -06:00
Brendan Chandler
0adaa7fcf1 re-remove osdMessageQueue.c from RTEMS-kernel 2021-02-05 13:40:42 -06:00
Brendan Chandler
d21c6d5545 Merge branch '7.0' into rtems5 2021-02-05 12:39:22 -06:00
Michael Davidsaver
43bd5ee1c2 Com: always skip SOCK_CLOEXEC for RTEMS and vxWorks 2021-02-05 10:32:47 -08:00
Brendan Chandler
5c792687a6 Merge branch '7.0' into rtems5 2021-02-05 12:21:20 -06:00
Brendan Chandler
cd0e6a4f9a Make sure the definition of IPPORT_USERRESERVED is defined
caProto.h was using IPPORT_USERRESERVED but not including itself,
meaning there was an order dependency of header inclusion when using
this header.  Now there shouldn't be.

Also, RTEMS wasn't defining IPPORT_USERRESERVED, so that definition
has been added.
2021-02-05 10:42:02 -06:00
Brendan Chandler
54c91f1458 Fix compile errors after rebasing changes for RTEMS5 2021-02-02 16:44:01 -06:00
Brendan Chandler
fe3e2c60a5 remove missing rtems_bsd_set_vprintf_handler 2021-01-29 12:36:32 -06:00
Brendan Chandler
e4885d2446 Remove redundant CPU_FLAGS use.
This variable is included in the generic OP_SYS_LDFLAGS and doesn't
need to also be set in OP_SYS_LDFLAGS_kernel.
2021-01-29 12:36:32 -06:00
Heinz Junkes
08b7dd1208 Add dhcp option cmdline (129) 2021-01-29 12:36:32 -06:00
Heinz Junkes
25a072540f Cosmetics and some typos 2021-01-29 12:36:32 -06:00
Heinz Junkes
399c63ec5c Add posix cpp flags to RTEMS config 2021-01-29 12:36:32 -06:00
Heinz Junkes
341ca91229 Add LEGACY_STACK_SUPPORT and telnet client 2021-01-29 12:36:32 -06:00
Heinz Junkes
54f2d8887f changed pvAccess url, save adaption to old network stack 2021-01-29 12:36:31 -06:00