add devoptab device for network code

Author: WinterMute

libogc/CMakeLists.txt

@@ -7,6 +7,7 @@ add_library(ogc STATIC
 	lwpcompat/lwpc_sem.c
 	lwpcompat/lwpc_mq.c
 
+	ogc_sockets/soc_init.c
 	ogc_sockets/soc_common.c
 	ogc_sockets/soc_socket.c
 	ogc_sockets/soc_bind.c

libogc/network_wii.c

@@ -51,13 +51,15 @@ distribution.
 #include <fcntl.h>
 #include <malloc.h>
 #include <poll.h>
-	
+
 #include "ipc.h"
 #include "processor.h"
 #include "network.h"
 #include "ogcsys.h"
 #include "lwp_heap.h"
 
+#include "ogc_sockets/soc.h"
+
 #define NET_HEAP_SIZE				64*1024
 
 #define IOS_O_NONBLOCK				0x04			//(O_NONBLOCK >> 16) - it's in octal representation, so this shift leads to 0 and hence nonblocking sockets didn't work. changed it to the right value.
@@ -1209,6 +1211,8 @@ s32 if_configex(struct in_addr *local_ip, struct in_addr *netmask, struct in_add
 
 	if(netmask)
 		netmask->s_addr = ipconfig->subnetMask;
+
+	socInit();
 
 	if(!gateway)
 		return 0;

libogc/ogc_sockets/soc.h

@@ -0,0 +1,4 @@
+#pragma once
+
+int socInit(void);
+int socExit(void);

libogc/ogc_sockets/soc_init.c

@@ -0,0 +1,122 @@
+#include "soc_common.h"
+#include <errno.h>
+#include <sys/socket.h>
+
+static int
+soc_open(struct _reent *r,
+         void          *fileStruct,
+         const char    *path,
+         int           flags,
+         int           mode)
+{
+  r->_errno = ENOSYS;
+  return -1;
+}
+
+static int
+soc_close(struct _reent *r,
+          void          *fd)
+{
+
+  int ret = net_close(*(Handle*)fd);
+
+  if (ret < 0 ) {
+    errno = -ret;
+    ret = -1;
+  }
+
+  return ret;
+}
+
+static ssize_t
+soc_write(struct _reent *r,
+          void          *fd,
+          const char    *ptr,
+          size_t        len)
+{
+
+  int ret = net_sendto(*(Handle*)fd, ptr, len, 0, NULL, 0);
+
+  if (ret < 0 ) {
+    errno = -ret;
+    ret = -1;
+  }
+
+  return ret;
+}
+
+static ssize_t
+soc_read(struct _reent *r,
+         void          *fd,
+         char          *ptr,
+         size_t        len)
+{
+
+  int ret = net_recvfrom(*(Handle*)fd, ptr, len, 0, NULL, NULL);
+
+  if (ret < 0 ) {
+    errno = -ret;
+    ret = -1;
+  }
+  return ret;
+}
+
+
+static devoptab_t
+soc_devoptab =
+{
+  .name         = "soc",
+  .structSize   = sizeof(Handle),
+  .open_r       = soc_open,
+  .close_r      = soc_close,
+  .write_r      = soc_write,
+  .read_r       = soc_read,
+  .seek_r       = NULL,
+  .fstat_r      = NULL,
+  .stat_r       = NULL,
+  .link_r       = NULL,
+  .unlink_r     = NULL,
+  .chdir_r      = NULL,
+  .rename_r     = NULL,
+  .mkdir_r      = NULL,
+  .dirStateSize = 0,
+  .diropen_r    = NULL,
+  .dirreset_r   = NULL,
+  .dirnext_r    = NULL,
+  .dirclose_r   = NULL,
+  .statvfs_r    = NULL,
+  .ftruncate_r  = NULL,
+  .fsync_r      = NULL,
+  .deviceData   = 0,
+  .chmod_r      = NULL,
+  .fchmod_r     = NULL,
+};
+
+
+int socInit(void)
+{
+  /* check that the "soc" device doesn't already exist */
+  int dev = FindDevice("soc:");
+  if(dev >= 0)
+    return -1;
+
+  /* add the "soc" device */
+  dev = AddDevice(&soc_devoptab);
+  if(dev < 0)
+    return -1;
+
+  return 0;
+}
+
+int socExit(void)
+{
+  int ret = 0;
+  int dev;
+
+  dev = FindDevice("soc:");
+
+  if(dev >= 0)
+    RemoveDevice("soc:");
+
+  return ret;
+}