From 04415b025e6bd25bc2eb5cb5f33003efa7f29106 Mon Sep 17 00:00:00 2001 From: Xavier Del Campo Romero Date: Sat, 24 Sep 2022 06:42:02 +0200 Subject: net: Relocate source files for consistency --- src/net/CMakeLists.txt | 6 ++--- src/net/posix/src/serial.c | 50 ++++++++++++++++++++++++++++++++++++++ src/net/ps1/src/net.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++ src/net/src/posix/serial.c | 50 -------------------------------------- src/net/src/ps1/net.c | 60 ---------------------------------------------- src/net/src/win9x/serial.c | 49 ------------------------------------- src/net/win9x/src/serial.c | 49 +++++++++++++++++++++++++++++++++++++ 7 files changed, 162 insertions(+), 162 deletions(-) create mode 100644 src/net/posix/src/serial.c create mode 100644 src/net/ps1/src/net.c delete mode 100644 src/net/src/posix/serial.c delete mode 100644 src/net/src/ps1/net.c delete mode 100644 src/net/src/win9x/serial.c create mode 100644 src/net/win9x/src/serial.c (limited to 'src') diff --git a/src/net/CMakeLists.txt b/src/net/CMakeLists.txt index 38cd8df..79bd653 100644 --- a/src/net/CMakeLists.txt +++ b/src/net/CMakeLists.txt @@ -2,7 +2,7 @@ set(src "src/common.c") if(PS1_BUILD) set(src ${src} - "src/ps1/net.c" + "ps1/src/net.c" ) else() set(src ${src} @@ -11,7 +11,7 @@ else() ) if(WIN9X_BUILD OR ${CMAKE_HOST_SYSTEM_NAME} STREQUAL "Windows") - set(src ${src} "src/win9x/serial.c") + set(src ${src} "win9x/src/serial.c") else() # Assume POSIX if the command below executes successfully execute_process(COMMAND uname -m RESULT_VARIABLE result OUTPUT_QUIET) @@ -19,7 +19,7 @@ else() if(result) message(FATAL_ERROR "Unknown operating system") else() - set(src ${src} "src/posix/serial.c") + set(src ${src} "posix/src/serial.c") endif() endif() diff --git a/src/net/posix/src/serial.c b/src/net/posix/src/serial.c new file mode 100644 index 0000000..b0357b9 --- /dev/null +++ b/src/net/posix/src/serial.c @@ -0,0 +1,50 @@ +#include +#include +#include +#include + +int net_read_serial(struct net_socket_domain *const h, void *const buf, + const size_t n) +{ + return -1; +} + +int net_write_serial(struct net_socket_domain *const h, const void *const buf, + const size_t n) +{ + return -1; +} + +int net_close_serial(struct net_socket_domain *const h) +{ + return -1; +} + +int net_update_serial(struct net_socket_domain *const h) +{ + return -1; +} + +struct net_socket_domain *net_connect_serial(const union net_connect *const srv) +{ + return NULL; +} + +struct net_socket_domain *net_server_serial(const union net_server *const srv) +{ + return NULL; +} + +int net_init_serial(void) +{ + return 0; +} + +void net_deinit_serial(void) +{ +} + +const char *const *net_serial_devices(size_t *const n) +{ + return NULL; +} diff --git a/src/net/ps1/src/net.c b/src/net/ps1/src/net.c new file mode 100644 index 0000000..8c037f3 --- /dev/null +++ b/src/net/ps1/src/net.c @@ -0,0 +1,60 @@ +#include +#include +#include +#include +#include + +int net_read(struct net_socket *const h, void *const buf, const size_t n) +{ + return -1; +} + +int net_write(struct net_socket *const h, const void *const buf, const size_t n) +{ + return -1; +} + +int net_close(struct net_socket *const h) +{ + return -1; +} + +int net_update(struct net_socket *const h) +{ + return -1; +} + +struct net_socket *net_connect(const union net_connect *const c) +{ + return NULL; +} + +struct net_socket *net_server(const union net_server *const c) +{ + return NULL; +} + +int net_init(void) +{ + return 0; +} + +void net_deinit(void) +{ +} + +bool net_available(const enum net_domain d) +{ + return d == NET_DOMAIN_SERIAL; +} + +const char *const *net_serial_devices(size_t *const n) +{ + static const char *const dev[] = + { + "PS1 port" + }; + + *n = sizeof dev / sizeof *dev; + return dev; +} diff --git a/src/net/src/posix/serial.c b/src/net/src/posix/serial.c deleted file mode 100644 index b0357b9..0000000 --- a/src/net/src/posix/serial.c +++ /dev/null @@ -1,50 +0,0 @@ -#include -#include -#include -#include - -int net_read_serial(struct net_socket_domain *const h, void *const buf, - const size_t n) -{ - return -1; -} - -int net_write_serial(struct net_socket_domain *const h, const void *const buf, - const size_t n) -{ - return -1; -} - -int net_close_serial(struct net_socket_domain *const h) -{ - return -1; -} - -int net_update_serial(struct net_socket_domain *const h) -{ - return -1; -} - -struct net_socket_domain *net_connect_serial(const union net_connect *const srv) -{ - return NULL; -} - -struct net_socket_domain *net_server_serial(const union net_server *const srv) -{ - return NULL; -} - -int net_init_serial(void) -{ - return 0; -} - -void net_deinit_serial(void) -{ -} - -const char *const *net_serial_devices(size_t *const n) -{ - return NULL; -} diff --git a/src/net/src/ps1/net.c b/src/net/src/ps1/net.c deleted file mode 100644 index 8c037f3..0000000 --- a/src/net/src/ps1/net.c +++ /dev/null @@ -1,60 +0,0 @@ -#include -#include -#include -#include -#include - -int net_read(struct net_socket *const h, void *const buf, const size_t n) -{ - return -1; -} - -int net_write(struct net_socket *const h, const void *const buf, const size_t n) -{ - return -1; -} - -int net_close(struct net_socket *const h) -{ - return -1; -} - -int net_update(struct net_socket *const h) -{ - return -1; -} - -struct net_socket *net_connect(const union net_connect *const c) -{ - return NULL; -} - -struct net_socket *net_server(const union net_server *const c) -{ - return NULL; -} - -int net_init(void) -{ - return 0; -} - -void net_deinit(void) -{ -} - -bool net_available(const enum net_domain d) -{ - return d == NET_DOMAIN_SERIAL; -} - -const char *const *net_serial_devices(size_t *const n) -{ - static const char *const dev[] = - { - "PS1 port" - }; - - *n = sizeof dev / sizeof *dev; - return dev; -} diff --git a/src/net/src/win9x/serial.c b/src/net/src/win9x/serial.c deleted file mode 100644 index c12369a..0000000 --- a/src/net/src/win9x/serial.c +++ /dev/null @@ -1,49 +0,0 @@ -#include -#include -#include - -int net_read_serial(struct net_socket_domain *const h, void *const buf, - const size_t n) -{ - return -1; -} - -int net_write_serial(struct net_socket_domain *const h, const void *const buf, - const size_t n) -{ - return -1; -} - -int net_close_serial(struct net_socket_domain *const h) -{ - return -1; -} - -int net_update_serial(struct net_socket_domain *const h) -{ - return -1; -} - -struct net_socket_domain *net_connect_serial(const union net_connect *const srv) -{ - return NULL; -} - -struct net_socket_domain *net_server_serial(const union net_server *const srv) -{ - return NULL; -} - -int net_init_serial(void) -{ - return 0; -} - -void net_deinit_serial(void) -{ -} - -const char *const *net_serial_devices(size_t *const n) -{ - return NULL; -} diff --git a/src/net/win9x/src/serial.c b/src/net/win9x/src/serial.c new file mode 100644 index 0000000..c12369a --- /dev/null +++ b/src/net/win9x/src/serial.c @@ -0,0 +1,49 @@ +#include +#include +#include + +int net_read_serial(struct net_socket_domain *const h, void *const buf, + const size_t n) +{ + return -1; +} + +int net_write_serial(struct net_socket_domain *const h, const void *const buf, + const size_t n) +{ + return -1; +} + +int net_close_serial(struct net_socket_domain *const h) +{ + return -1; +} + +int net_update_serial(struct net_socket_domain *const h) +{ + return -1; +} + +struct net_socket_domain *net_connect_serial(const union net_connect *const srv) +{ + return NULL; +} + +struct net_socket_domain *net_server_serial(const union net_server *const srv) +{ + return NULL; +} + +int net_init_serial(void) +{ + return 0; +} + +void net_deinit_serial(void) +{ +} + +const char *const *net_serial_devices(size_t *const n) +{ + return NULL; +} -- cgit v1.2.3