From a57ebc55fad59971988adc7f83ad52cc886d283d Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Wed, 8 Jan 2025 14:39:49 +0100 Subject: [PATCH] os: move genode_c_api/socket.h from lxip to os Move lxip local socket C-API to os/include/genode_c_api issue #5471 --- repos/dde_linux/lib/mk/lxip.inc | 2 +- .../lxip/include/genode_c_api/socket_types.h | 33 ------------------- .../lxip => os}/include/genode_c_api/socket.h | 4 +-- 3 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 repos/dde_linux/src/lib/lxip/include/genode_c_api/socket_types.h rename repos/{dde_linux/src/lib/lxip => os}/include/genode_c_api/socket.h (97%) diff --git a/repos/dde_linux/lib/mk/lxip.inc b/repos/dde_linux/lib/mk/lxip.inc index 82994f615c..010b340776 100644 --- a/repos/dde_linux/lib/mk/lxip.inc +++ b/repos/dde_linux/lib/mk/lxip.inc @@ -3,7 +3,7 @@ LIBS := jitterentropy virt_lx_emul virt_linux_generated SHARED_LIB := yes TARGET_LIB_DIR := $(LXIP_DIR) -INC_DIR += $(LXIP_DIR)/shadow $(LXIP_DIR)/include $(LXIP_DIR) +INC_DIR += $(LXIP_DIR)/shadow $(LXIP_DIR) SRC_CC += lx_emul/random.cc diff --git a/repos/dde_linux/src/lib/lxip/include/genode_c_api/socket_types.h b/repos/dde_linux/src/lib/lxip/include/genode_c_api/socket_types.h deleted file mode 100644 index c9c1ecf6fe..0000000000 --- a/repos/dde_linux/src/lib/lxip/include/genode_c_api/socket_types.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - * \brief Definitions of standard socket API values used when no libc headers - * are present - * \author Sebastian Sumpf - * \date 2024-01-29 - */ - -/* - * Copyright (C) 2024 Genode Labs GmbH - * - * This file is distributed under the terms of the GNU General Public License - * version 2. - */ - -enum { - /* socket domain */ - AF_UNSPEC = 0, - AF_INET = 2, - /* socket type */ - SOCK_STREAM = 1, - SOCK_DGRAM = 2, - /* protocol */ - IPPROTO_TCP = 6, - IPPROTO_UDP = 17, - /* sockaddr_in */ - INADDR_ANY = 0ul, - INADDR_BROADCAST = ~0u, - - /* shutdown */ - SHUT_RD = 0, - SHUT_WR = 1, - SHUT_RDWR = 2, -}; diff --git a/repos/dde_linux/src/lib/lxip/include/genode_c_api/socket.h b/repos/os/include/genode_c_api/socket.h similarity index 97% rename from repos/dde_linux/src/lib/lxip/include/genode_c_api/socket.h rename to repos/os/include/genode_c_api/socket.h index bb07c28f25..4f708bbf8c 100644 --- a/repos/dde_linux/src/lib/lxip/include/genode_c_api/socket.h +++ b/repos/os/include/genode_c_api/socket.h @@ -7,8 +7,8 @@ /* * Copyright (C) 2024 Genode Labs GmbH * - * This file is distributed under the terms of the GNU General Public License - * version 2. + * This file is part of the Genode OS framework, which is distributed + * under the terms of the GNU Affero General Public License version 3. */ #include