consolidate with bsd headers

Author: WinterMute

CMakeLists.txt

@@ -29,6 +29,7 @@ target_include_directories(libogc_inc INTERFACE
 	gc/sdcard
 	gc/wiiuse
 	gc/di
+	external/bsd/include
 )
 
 target_compile_options(libogc_inc INTERFACE
@@ -87,3 +88,10 @@ install(
 		PATTERN "*.hpp"
 		PATTERN "*.inc"
 )
+
+install(
+	DIRECTORY ${PROJECT_SOURCE_DIR}/external/bsd/include/
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+	FILES_MATCHING
+		PATTERN "*.h"
+)

external/bsd/include/poll.h

@@ -65,13 +65,14 @@ struct pollfd {
  * POLLIN includes all of normal, band and urgent data.  Most poll handlers
  * on FreeBSD only treat it as "normal" data.
  */
-#define	POLLIN		0x0001		/* any readable data available */
-#define	POLLPRI		0x0002		/* OOB/Urgent readable data */
-#define	POLLOUT		0x0004		/* file descriptor is writeable */
-#define	POLLRDNORM	0x0040		/* non-OOB/URG data available */
-#define	POLLWRNORM	POLLOUT		/* no write type differentiation */
-#define	POLLRDBAND	0x0080		/* OOB/Urgent readable data */
-#define	POLLWRBAND	0x0100		/* OOB/Urgent data can be written */
+#define POLLRDNORM  0x0001                   /* non-OOB/URG data available */
+#define POLLRDBAND  0x0002                   /* OOB/Urgent readable data */
+#define POLLPRI     0x0004                   /* OOB/Urgent readable data */
+#define POLLWRNORM  0x0008                   /* no write type differentiation */
+#define POLLWRBAND  0x0010                   /* OOB/Urgent data can be written */
+#define POLLIN      (POLLRDNORM|POLLRDBAND)  /* any readable data available */
+#define POLLOUT     POLLWRNORM               /* file descriptor is writeable */
+
 
 #if __BSD_VISIBLE
 /* General FreeBSD extension (currently only supported for sockets): */
@@ -82,9 +83,9 @@ struct pollfd {
  * These events are set if they occur regardless of whether they were
  * requested.
  */
-#define	POLLERR		0x0008		/* some poll error occurred */
-#define	POLLHUP		0x0010		/* file descriptor was "hung up" */
-#define	POLLNVAL	0x0020		/* requested events "invalid" */
+#define	POLLERR		0x0020		/* some poll error occurred */
+#define	POLLHUP		0x0040		/* file descriptor was "hung up" */
+#define	POLLNVAL	0x0080		/* requested events "invalid" */
 
 #if __BSD_VISIBLE
 

external/bsd/include/sys/socket.h

@@ -406,7 +406,7 @@ struct msghdr {
 #define	MSG_CTRUNC	 0x00000020	/* control data lost before delivery */
 #define	MSG_WAITALL	 0x00000040	/* wait for full request or error */
 #if __BSD_VISIBLE
-#define	MSG_DONTWAIT	 0x00000080	/* this message should be nonblocking */
+#define	MSG_DONTWAIT	 0x00000040	/* this message should be nonblocking */
 #define	MSG_EOF		 0x00000100	/* data completes connection */
 /*			 0x00000200	   unused */
 /*			 0x00000400	   unused */

gc/ipv4/lwip/inet.h

@@ -32,6 +32,8 @@
 #ifndef __LWIP_INET_H__
 #define __LWIP_INET_H__
 
+#include <arpa/inet.h>
+
 #include "lwip/arch.h"
 
 #include "lwip/opt.h"
@@ -47,41 +49,6 @@ u16_t inet_chksum_pseudo(struct pbuf *p,
        struct ip_addr *src, struct ip_addr *dest,
        u8_t proto, u16_t proto_len);
 
-u32_t inet_addr(const char *cp);
-s8_t inet_aton(const char *cp, struct in_addr *addr);
-char *inet_ntoa(struct in_addr addr); /* returns ptr to static buffer; not reentrant! */
-
-#ifdef htons
-#undef htons
-#endif /* htons */
-#ifdef htonl
-#undef htonl
-#endif /* htonl */
-#ifdef ntohs
-#undef ntohs
-#endif /* ntohs */
-#ifdef ntohl
-#undef ntohl
-#endif /* ntohl */
-
-#if BYTE_ORDER == BIG_ENDIAN
-#define htons(x) (x)
-#define ntohs(x) (x)
-#define htonl(x) (x)
-#define ntohl(x) (x)
-#else
-#ifdef LWIP_PREFIX_BYTEORDER_FUNCS
-/* workaround for naming collisions on some platforms */
-#define htons lwip_htons
-#define ntohs lwip_ntohs
-#define htonl lwip_htonl
-#define ntohl lwip_ntohl
-#endif
-u16_t htons(u16_t x);
-u16_t ntohs(u16_t x);
-u32_t htonl(u32_t x);
-u32_t ntohl(u32_t x);
-#endif
 
 #endif /* __LWIP_INET_H__ */
 

gc/ipv4/lwip/ip.h

@@ -57,15 +57,6 @@ err_t ip_output_if(struct pbuf *p, struct ip_addr *src, struct ip_addr *dest,
 #define IP_PROTO_UDPLITE 170
 #define IP_PROTO_TCP 6
 
-/* This is passed as the destination address to ip_output_if (not
-   to ip_output), meaning that an IP header already is constructed
-   in the pbuf. This is used when TCP retransmits. */
-#ifdef IP_HDRINCL
-#undef IP_HDRINCL
-#endif /* IP_HDRINCL */
-#define IP_HDRINCL  NULL
-
-
 /* This is the common part of all PCB types. It needs to be at the
    beginning of a PCB type definition. It is located here so that
    changes to this common part are made in one location instead of

gc/ipv4/lwip/ip_addr.h

@@ -58,14 +58,6 @@ PACK_STRUCT_END
 #  include "arch/epstruct.h"
 #endif
 
-/* For compatibility with BSD code */
-#ifndef HAVE_IN_ADDR
-#define HAVE_IN_ADDR
-struct in_addr {
-  u32_t s_addr;
-};
-#endif
-
 struct netif;
 
 extern const struct ip_addr ip_addr_any;
@@ -77,40 +69,6 @@ extern const struct ip_addr ip_addr_broadcast;
 #define IP_ADDR_ANY ((struct ip_addr *)&ip_addr_any)
 #define IP_ADDR_BROADCAST ((struct ip_addr *)&ip_addr_broadcast)
 
-#define INADDR_NONE    ((u32_t) 0xffffffff)  /* 255.255.255.255 */
-#define INADDR_LOOPBACK    ((u32_t) 0x7f000001)  /* 127.0.0.1 */
-
-/* Definitions of the bits in an Internet address integer.
-
-   On subnets, host and network parts are found according to
-   the subnet mask, not these masks.  */
-
-#define  IN_CLASSA(a)    ((((u32_t)(a)) & 0x80000000) == 0)
-#define  IN_CLASSA_NET    0xff000000
-#define  IN_CLASSA_NSHIFT  24
-#define  IN_CLASSA_HOST    (0xffffffff & ~IN_CLASSA_NET)
-#define  IN_CLASSA_MAX    128
-
-#define  IN_CLASSB(a)    ((((u32_t)(a)) & 0xc0000000) == 0x80000000)
-#define  IN_CLASSB_NET    0xffff0000
-#define  IN_CLASSB_NSHIFT  16
-#define  IN_CLASSB_HOST    (0xffffffff & ~IN_CLASSB_NET)
-#define  IN_CLASSB_MAX    65536
-
-#define  IN_CLASSC(a)    ((((u32_t)(a)) & 0xe0000000) == 0xc0000000)
-#define  IN_CLASSC_NET    0xffffff00
-#define  IN_CLASSC_NSHIFT  8
-#define  IN_CLASSC_HOST    (0xffffffff & ~IN_CLASSC_NET)
-
-#define IN_CLASSD(a)        (((u32_t)(a) & 0xf0000000) == 0xe0000000)
-#define IN_CLASSD_NET       0xf0000000  /* These ones aren't really */
-#define IN_CLASSD_NSHIFT    28      /* net and host fields, but */
-#define IN_CLASSD_HOST      0x0fffffff  /* routing needn't know.    */
-#define IN_MULTICAST(a)     IN_CLASSD(a)
-
-#define IN_EXPERIMENTAL(a)  (((u32_t)(a) & 0xf0000000) == 0xf0000000)
-#define IN_BADCLASS(a)      (((u32_t)(a) & 0xf0000000) == 0xf0000000)
-
 #define IN_LOOPBACKNET      127         /* official! */
 
 

gc/network.h

@@ -5,6 +5,12 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
+#include <sys/socket.h>
+#include <sys/ioctl.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+
 #define INVALID_SOCKET	(~0)
 #define SOCKET_ERROR	(-1)
 
@@ -41,15 +47,6 @@
 #define  SO_TYPE			0x1008    /* get socket type */
 
 
-
-/*
- * Structure used for manipulating linger option.
- */
-struct linger {
-       int l_onoff;                /* option on/off */
-       int l_linger;               /* linger time */
-};
-
 /*
  * Level number for (get/set)sockopt() to apply to socket itself.
  */
@@ -64,17 +61,11 @@ struct linger {
 #define IPPROTO_TCP			6
 #define IPPROTO_UDP			17
 
-#define INADDR_ANY			0
-#define INADDR_BROADCAST	0xffffffff
-
-/* Flags we can use with send and recv. */
-#define MSG_DONTWAIT		0x40            /* Nonblocking i/o for this operation only */
-
 /*
  * Options for level IPPROTO_IP
  */
-#define IP_TOS				1
-#define IP_TTL				2
+//#define IP_TOS				1
+//#define IP_TTL				2
 
 
 #define IPTOS_TOS_MASK      0x1E
@@ -99,48 +90,6 @@ struct linger {
 #define IPTOS_PREC_PRIORITY             0x20
 #define IPTOS_PREC_ROUTINE              0x00
 
-
-/*
- * Commands for ioctlsocket(),  taken from the BSD file fcntl.h.
- *
- *
- * Ioctl's have the command encoded in the lower word,
- * and the size of any in or out parameters in the upper
- * word.  The high 2 bits of the upper word are used
- * to encode the in/out status of the parameter; for now
- * we restrict parameters to at most 128 bytes.
- */
-#if !defined(FIONREAD) || !defined(FIONBIO)
-#define IOCPARM_MASK    0x7f            /* parameters must be < 128 bytes */
-#define IOC_VOID        0x20000000      /* no parameters */
-#define IOC_OUT         0x40000000      /* copy out parameters */
-#define IOC_IN          0x80000000      /* copy in parameters */
-#define IOC_INOUT       (IOC_IN|IOC_OUT)
-                                        /* 0x20000000 distinguishes new &
-                                           old ioctl's */
-#define _IO(x,y)        (IOC_VOID|((x)<<8)|(y))
-
-#define _IOR(x,y,t)     (IOC_OUT|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y))
-
-#define _IOW(x,y,t)     (IOC_IN|(((long)sizeof(t)&IOCPARM_MASK)<<16)|((x)<<8)|(y))
-#endif
-
-#ifndef FIONREAD
-#define FIONREAD    _IOR('f', 127, unsigned long) /* get # bytes to read */
-#endif
-#ifndef FIONBIO
-#define FIONBIO     _IOW('f', 126, unsigned long) /* set/clear non-blocking i/o */
-#endif
-
-/* Socket I/O Controls */
-#ifndef SIOCSHIWAT
-#define SIOCSHIWAT  _IOW('s',  0, unsigned long)  /* set high watermark */
-#define SIOCGHIWAT  _IOR('s',  1, unsigned long)  /* get high watermark */
-#define SIOCSLOWAT  _IOW('s',  2, unsigned long)  /* set low watermark */
-#define SIOCGLOWAT  _IOR('s',  3, unsigned long)  /* get low watermark */
-#define SIOCATMARK  _IOR('s',  7, unsigned long)  /* at oob mark? */
-#endif
-
 #ifndef O_NONBLOCK
 #define O_NONBLOCK			04000U
 #endif
@@ -195,59 +144,17 @@ struct linger {
 #define ip4_addr4(ipaddr) ((u32)(ntohl((ipaddr)->s_addr)) & 0xff)
 #endif
 
-#define POLLRDNORM			0x0001
-#define POLLRDBAND			0x0002
-#define POLLPRI				0x0004
-#define POLLWRNORM			0x0008
-#define POLLWRBAND			0x0010
-#define POLLERR				0x0020
-#define POLLHUP				0x0040
-#define POLLNVAL			0x0080
-#define POLLIN				(POLLRDNORM|POLLRDBAND)
-#define POLLOUT				POLLWRNORM
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#ifndef HAVE_IN_ADDR
-#define HAVE_IN_ADDR
-struct in_addr {
-  u32 s_addr;
-};
-#endif
-
-struct sockaddr_in {
-  u8 sin_len;
-  u8 sin_family;
-  u16 sin_port;
-  struct in_addr sin_addr;
-  s8 sin_zero[8];
-};
-
-struct sockaddr {
-  u8 sa_len;
-  u8 sa_family;
-  s8 sa_data[14];
-};
-
-struct hostent {
-  char    *h_name;        /* official name of host */
-  char    **h_aliases;    /* alias list */
-  u16     h_addrtype;     /* host address type */
-  u16     h_length;       /* length of address */
-  char    **h_addr_list;  /* list of addresses from name server */
-};
-
 struct pollsd {
 	s32 socket;
 	u32 events;
 	u32 revents;
 };
 
 u32 inet_addr(const char *cp);
-s8 inet_aton(const char *cp, struct in_addr *addr);
-char *inet_ntoa(struct in_addr addr); /* returns ptr to static buffer; not reentrant! */
 
 s32 if_config( char *local_ip, char *netmask, char *gateway,bool use_dhcp, int max_retries);
 s32 if_configex(struct in_addr *local_ip, struct in_addr *netmask, struct in_addr *gateway, bool use_dhcp, int max_retries);

libdb/tcpip.h

@@ -4,39 +4,8 @@
 #include "uIP/uip.h"
 #include <sys/time.h>
 #include <sys/types.h>
-
-#define AF_UNSPEC			0
-#define AF_INET				2
-#define PF_INET				AF_INET
-#define PF_UNSPEC			AF_UNSPEC
-
-#define INADDR_ANY			0
-#define INADDR_BROADCAST	0xffffffff
-
-#ifndef socklen_t
-#define socklen_t u32_t
-#endif
-
-#ifndef HAVE_IN_ADDR
-#define HAVE_IN_ADDR
-struct in_addr {
-  u32 s_addr;
-};
-#endif
-
-struct sockaddr_in {
-  u8 sin_len;
-  u8 sin_family;
-  u16 sin_port;
-  struct in_addr sin_addr;
-  s8 sin_zero[8];
-};
-
-struct sockaddr {
-  u8 sa_len;
-  u8 sa_family;
-  s8 sa_data[14];
-};
+#include <sys/socket.h>
+#include "netinet/in.h"
 
 struct dbginterface* tcpip_init(struct uip_ip_addr *localip,struct uip_ip_addr *netmask,struct uip_ip_addr *gateway,u16 port);