Skip to content

Commit

Permalink
native: add support for FreeBSD
Browse files Browse the repository at this point in the history
tested with FreeBSD 10.0

fixes: RIOT-OS#505
  • Loading branch information
LudwigKnuepfer committed Apr 16, 2014
1 parent be5cd37 commit 788aba5
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 8 deletions.
18 changes: 13 additions & 5 deletions boards/native/Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ export ELF = $(BINDIR)$(PROJECT).elf
# toolchain:
export PREFIX =
export CC ?= $(PREFIX)gcc
export AR = $(PREFIX)ar
export AS = $(PREFIX)as
export LINK = $(PREFIX)gcc
export SIZE = $(PREFIX)size
export AR ?= $(PREFIX)ar
export AS ?= $(PREFIX)as
export LINK ?= $(PREFIX)gcc
export SIZE ?= $(PREFIX)size
export OBJCOPY = true

export DEBUGGER = gdb
Expand All @@ -25,7 +25,15 @@ export GPROF ?= gprof

# flags:
export CFLAGS += -Wall -Wextra -pedantic -m32
export LINKFLAGS += -m32 -gc -ldl
ifeq ($(shell uname -s),FreeBSD)
export CFLAGS += -DCOMPAT_32BIT -L/usr/lib32 -B/usr/lib32
endif
export LINKFLAGS += -m32 -gc
ifeq ($(shell uname -s),FreeBSD)
export LINKFLAGS += -DCOMPAT_32BIT -L/usr/lib32 -B/usr/lib32 -L $(BINDIR)
else
export LINKFLAGS += -ldl
endif
export ASFLAGS =
export DEBUGGER_FLAGS = $(ELF)
term-memcheck: export VALGRIND_FLAGS ?= --track-origins=yes
Expand Down
3 changes: 2 additions & 1 deletion cpu/native/include/native_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#define _NATIVE_INTERNAL_H

#include <signal.h>
#

/**
* internal functions
Expand Down Expand Up @@ -80,7 +81,7 @@ int unregister_interrupt(int sig);
* check here for more:
* http://sourceforge.net/p/predef/wiki/OperatingSystems/
*/
#ifdef BSD // BSD = (FreeBSD, Darwin, ...)
#if (defined(__FreeBSD__) || defined(__MACH__))
#ifndef _XOPEN_SOURCE
#define _XOPEN_SOURCE
#include <ucontext.h>
Expand Down
2 changes: 1 addition & 1 deletion cpu/native/irq_cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ void native_isr_entry(int sig, siginfo_t *info, void *context)
#ifdef __MACH__
_native_saved_eip = ((ucontext_t *)context)->uc_mcontext->__ss.__eip;
((ucontext_t *)context)->uc_mcontext->__ss.__eip = (unsigned int)&_native_sig_leave_tramp;
#elif BSD
#elif defined(__FreeBSD__)
_native_saved_eip = ((struct sigcontext *)context)->sc_eip;
((struct sigcontext *)context)->sc_eip = (unsigned int)&_native_sig_leave_tramp;
#else
Expand Down
12 changes: 11 additions & 1 deletion cpu/native/net/tap.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@
#undef _POSIX_C_SOURCE
#include <ifaddrs.h>
#include <net/if_dl.h>

#elif defined(__FreeBSD__)
#include <sys/socket.h>
#include <net/if.h>
#include <ifaddrs.h>
#include <net/if_dl.h>

#else
#include <net/if.h>
#include <linux/if_tun.h>
Expand Down Expand Up @@ -232,6 +239,9 @@ int tap_init(char *name)
#ifdef __MACH__ /* OSX */
char clonedev[255] = "/dev/"; /* XXX bad size */
strncpy(clonedev+5, name, 250);
#elif defined(__FreeBSD__)
char clonedev[255] = "/dev/"; /* XXX bad size */
strncpy(clonedev+5, name, 250);
#else /* Linux */
struct ifreq ifr;
const char *clonedev = "/dev/net/tun";
Expand All @@ -242,7 +252,7 @@ int tap_init(char *name)
err(EXIT_FAILURE, "open(%s)", clonedev);
}

#ifdef __MACH__ /* OSX */
#if (defined(__MACH__) || defined(__FreeBSD__)) /* OSX/FreeBSD */
struct ifaddrs* iflist;
if (getifaddrs(&iflist) == 0) {
for (struct ifaddrs *cur = iflist; cur; cur = cur->ifa_next) {
Expand Down
3 changes: 3 additions & 0 deletions cpu/native/syscalls.c
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,9 @@ ssize_t _native_write(int fd, const void *buf, size_t count)
return r;
}

#if defined(__FreeBSD__)
#undef putchar
#endif
int putchar(int c) {
_native_write(STDOUT_FILENO, &c, 1);
return 0;
Expand Down

0 comments on commit 788aba5

Please sign in to comment.