[rtems-libbsd commit] rtemsbsd: Remove DHCP init wrapper

Chris Johns chrisj at rtems.org
Thu Sep 2 02:43:00 UTC 2021


Module:    rtems-libbsd
Branch:    6-freebsd-12
Commit:    ac4db4cec5b6b1e0a25e910851e50831afb0749d
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=ac4db4cec5b6b1e0a25e910851e50831afb0749d

Author:    Chris Johns <chrisj at rtems.org>
Date:      Sat Jul 24 10:31:12 2021 +1000

rtemsbsd: Remove DHCP init wrapper

- Object files cannot config init and resided in libbsd.a

Update #4475

---

 libbsd.py                            |  1 -
 rtemsbsd/rtems/rtems-bsd-init-dhcp.c | 91 ------------------------------------
 2 files changed, 92 deletions(-)

diff --git a/libbsd.py b/libbsd.py
index 8faef5a..0b082ce 100644
--- a/libbsd.py
+++ b/libbsd.py
@@ -256,7 +256,6 @@ class rtems(builder.Module):
                 'rtems/rtems-bsd-ifconfig.c',
                 'rtems/rtems-bsd-iface.c',
                 'rtems/rtems-bsd-ifconfig-lo0.c',
-                'rtems/rtems-bsd-init-dhcp.c',
                 'rtems/rtems-bsd-rc-conf-net.c',
                 'rtems/rtems-bsd-rc-conf-pf.c',
                 'rtems/rtems-bsd-rc-conf.c',
diff --git a/rtemsbsd/rtems/rtems-bsd-init-dhcp.c b/rtemsbsd/rtems/rtems-bsd-init-dhcp.c
deleted file mode 100644
index d91f439..0000000
--- a/rtemsbsd/rtems/rtems-bsd-init-dhcp.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * @file
- *
- * @ingroup rtems_bsd_rtems
- *
- * @brief TODO.
- */
-
-/*
- * Copyright (c) 2009, 2018 embedded brains GmbH.  All rights reserved.
- *
- *  embedded brains GmbH
- *  Dornierstr. 4
- *  82178 Puchheim
- *  Germany
- *  <rtems at embedded-brains.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <rtems/bsd/bsd.h>
-#include <rtems/bsd/modules.h>
-#include <rtems/dhcpcd.h>
-
-#include <sysexits.h>
-
-#include <bsp.h>
-
-rtems_status_code
-rtems_bsd_initialize_dhcp(void)
-{
-	rtems_status_code sc;
-	int exit_code;
-
-	sc = rtems_bsd_initialize();
-	if (sc != RTEMS_SUCCESSFUL) {
-		return (sc);
-	}
-
-	exit_code = rtems_bsd_ifconfig_lo0();
-	if (exit_code != EX_OK) {
-		return (RTEMS_UNSATISFIED);
-	}
-
-	sc = rtems_dhcpcd_start(NULL);
-	if (sc != RTEMS_SUCCESSFUL) {
-		return (RTEMS_UNSATISFIED);
-	}
-
-	return (RTEMS_SUCCESSFUL);
-}
-
-#if defined(LIBBSP_I386_PC386_BSP_H)
-#define RTEMS_BSD_CONFIG_DOMAIN_PAGE_MBUFS_SIZE (64 * 1024 * 1024)
-#elif defined(LIBBSP_POWERPC_QORIQ_BSP_H)
-#define RTEMS_BSD_CONFIG_DOMAIN_PAGE_MBUFS_SIZE (32 * 1024 * 1024)
-#endif
-
-#define RTEMS_BSD_CONFIG_NET_PF_UNIX
-#define RTEMS_BSD_CONFIG_NET_IP_MROUTE
-
-#ifdef RTEMS_BSD_MODULE_NETINET6
-#define RTEMS_BSD_CONFIG_NET_IP6_MROUTE
-#endif
-
-#define RTEMS_BSD_CONFIG_NET_IF_BRIDGE
-#define RTEMS_BSD_CONFIG_NET_IF_LAGG
-#define RTEMS_BSD_CONFIG_NET_IF_VLAN
-#define RTEMS_BSD_CONFIG_BSP_CONFIG
-#define RTEMS_BSD_CONFIG_INIT
-
-#include <machine/rtems-bsd-config.h>



More information about the vc mailing list