summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xmain.c2
-rw-r--r--shared-bindings/network/__init__.c32
-rw-r--r--shared-bindings/network/__init__.h55
-rw-r--r--shared-bindings/socket/__init__.c2
-rw-r--r--shared-bindings/wiznet/__init__.c2
-rw-r--r--shared-bindings/wiznet/wiznet5k.c2
-rw-r--r--shared-module/network/__init__.c37
-rw-r--r--shared-module/network/__init__.h60
8 files changed, 102 insertions, 90 deletions
diff --git a/main.c b/main.c
index f1c68d06a..c1379c571 100755
--- a/main.c
+++ b/main.c
@@ -55,7 +55,7 @@
#include "supervisor/serial.h"
#ifdef MICROPY_PY_NETWORK
-#include "shared-bindings/network/__init__.h"
+#include "shared-module/network/__init__.h"
#endif
void do_str(const char *src, mp_parse_input_kind_t input_kind) {
diff --git a/shared-bindings/network/__init__.c b/shared-bindings/network/__init__.c
index f28d5265c..c5639b462 100644
--- a/shared-bindings/network/__init__.c
+++ b/shared-bindings/network/__init__.c
@@ -47,37 +47,7 @@
/// \module network - network configuration
///
-/// This module provides network drivers and routing configuration.
-
-void network_module_init(void) {
- mp_obj_list_init(&MP_STATE_PORT(mod_network_nic_list), 0);
-}
-
-void network_module_deinit(void) {
-}
-
-void network_module_register_nic(mp_obj_t nic) {
- for (mp_uint_t i = 0; i < MP_STATE_PORT(mod_network_nic_list).len; i++) {
- if (MP_STATE_PORT(mod_network_nic_list).items[i] == nic) {
- // nic already registered
- return;
- }
- }
- // nic not registered so add to list
- mp_obj_list_append(MP_OBJ_FROM_PTR(&MP_STATE_PORT(mod_network_nic_list)), nic);
-}
-
-mp_obj_t network_module_find_nic(const uint8_t *ip) {
- // find a NIC that is suited to given IP address
- for (mp_uint_t i = 0; i < MP_STATE_PORT(mod_network_nic_list).len; i++) {
- mp_obj_t nic = MP_STATE_PORT(mod_network_nic_list).items[i];
- // TODO check IP suitability here
- //mod_network_nic_type_t *nic_type = (mod_network_nic_type_t*)mp_obj_get_type(nic);
- return nic;
- }
-
- nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, translate("no available NIC")));
-}
+/// This module provides a registry of configured NICs.
STATIC mp_obj_t network_route(void) {
return MP_OBJ_FROM_PTR(&MP_STATE_PORT(mod_network_nic_list));
diff --git a/shared-bindings/network/__init__.h b/shared-bindings/network/__init__.h
index b3fd657b6..4fe5e75a3 100644
--- a/shared-bindings/network/__init__.h
+++ b/shared-bindings/network/__init__.h
@@ -26,59 +26,6 @@
#ifndef MICROPY_INCLUDED_SHARED_BINDINGS_NETWORK___INIT___H
#define MICROPY_INCLUDED_SHARED_BINDINGS_NETWORK___INIT___H
-#define MOD_NETWORK_IPADDR_BUF_SIZE (4)
-
-#define MOD_NETWORK_AF_INET (2)
-#define MOD_NETWORK_AF_INET6 (10)
-
-#define MOD_NETWORK_SOCK_STREAM (1)
-#define MOD_NETWORK_SOCK_DGRAM (2)
-#define MOD_NETWORK_SOCK_RAW (3)
-
-struct _mod_network_socket_obj_t;
-
-typedef struct _mod_network_nic_type_t {
- mp_obj_type_t base;
-
- // API for non-socket operations
- int (*gethostbyname)(mp_obj_t nic, const char *name, mp_uint_t len, uint8_t *ip_out);
-
- // API for socket operations; return -1 on error
- int (*socket)(struct _mod_network_socket_obj_t *socket, int *_errno);
- void (*close)(struct _mod_network_socket_obj_t *socket);
- int (*bind)(struct _mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno);
- int (*listen)(struct _mod_network_socket_obj_t *socket, mp_int_t backlog, int *_errno);
- int (*accept)(struct _mod_network_socket_obj_t *socket, struct _mod_network_socket_obj_t *socket2, byte *ip, mp_uint_t *port, int *_errno);
- int (*connect)(struct _mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno);
- mp_uint_t (*send)(struct _mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, int *_errno);
- mp_uint_t (*recv)(struct _mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, int *_errno);
- mp_uint_t (*sendto)(struct _mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, byte *ip, mp_uint_t port, int *_errno);
- mp_uint_t (*recvfrom)(struct _mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, byte *ip, mp_uint_t *port, int *_errno);
- int (*setsockopt)(struct _mod_network_socket_obj_t *socket, mp_uint_t level, mp_uint_t opt, const void *optval, mp_uint_t optlen, int *_errno);
- int (*settimeout)(struct _mod_network_socket_obj_t *socket, mp_uint_t timeout_ms, int *_errno);
- int (*ioctl)(struct _mod_network_socket_obj_t *socket, mp_uint_t request, mp_uint_t arg, int *_errno);
-} mod_network_nic_type_t;
-
-typedef struct _mod_network_socket_obj_t {
- mp_obj_base_t base;
- mp_obj_t nic;
- mod_network_nic_type_t *nic_type;
- union {
- struct {
- uint8_t domain;
- uint8_t type;
- int8_t fileno;
- } u_param;
- mp_uint_t u_state;
- };
-} mod_network_socket_obj_t;
-
-extern const mod_network_nic_type_t mod_network_nic_type_wiznet5k;
-extern const mod_network_nic_type_t mod_network_nic_type_cc3k;
-
-void network_module_init(void);
-void network_module_deinit(void);
-void network_module_register_nic(mp_obj_t nic);
-mp_obj_t network_module_find_nic(const uint8_t *ip);
+// nothing
#endif // MICROPY_INCLUDED_SHARED_BINDINGS_NETWORK___INIT___H
diff --git a/shared-bindings/socket/__init__.c b/shared-bindings/socket/__init__.c
index 85796c5c4..f6949b4bf 100644
--- a/shared-bindings/socket/__init__.c
+++ b/shared-bindings/socket/__init__.c
@@ -35,7 +35,7 @@
#include "py/mperrno.h"
#include "lib/netutils/netutils.h"
-#include "shared-bindings/network/__init__.h"
+#include "shared-module/network/__init__.h"
//| :mod:`socket` --- TCP, UDP and RAW socket support
//| =================================================
diff --git a/shared-bindings/wiznet/__init__.c b/shared-bindings/wiznet/__init__.c
index fbdac3885..342cb1052 100644
--- a/shared-bindings/wiznet/__init__.c
+++ b/shared-bindings/wiznet/__init__.c
@@ -33,7 +33,7 @@
#include "py/runtime.h"
#include "py/mphal.h"
-#include "shared-bindings/network/__init__.h"
+#include "shared-module/network/__init__.h"
//| :mod:`wiznet` --- Support for WizNet hardware
//| =============================================
diff --git a/shared-bindings/wiznet/wiznet5k.c b/shared-bindings/wiznet/wiznet5k.c
index ccbd2b115..26e02fb67 100644
--- a/shared-bindings/wiznet/wiznet5k.c
+++ b/shared-bindings/wiznet/wiznet5k.c
@@ -36,7 +36,7 @@
#include "py/mphal.h"
#include "lib/netutils/netutils.h"
-#include "shared-bindings/network/__init__.h"
+#include "shared-module/network/__init__.h"
#include "shared-bindings/digitalio/DigitalInOut.h"
#include "shared-bindings/digitalio/DriveMode.h"
#include "shared-bindings/busio/SPI.h"
diff --git a/shared-module/network/__init__.c b/shared-module/network/__init__.c
index 7e3b7fd26..6a955a0c4 100644
--- a/shared-module/network/__init__.c
+++ b/shared-module/network/__init__.c
@@ -24,10 +24,46 @@
* THE SOFTWARE.
*/
+#include "py/objlist.h"
+#include "py/runtime.h"
#include "py/mphal.h"
+#include "py/mperrno.h"
#include "shared-bindings/random/__init__.h"
+// mod_network_nic_list needs to be declared in mpconfigport.h
+
+
+void network_module_init(void) {
+ mp_obj_list_init(&MP_STATE_PORT(mod_network_nic_list), 0);
+}
+
+void network_module_deinit(void) {
+}
+
+void network_module_register_nic(mp_obj_t nic) {
+ for (mp_uint_t i = 0; i < MP_STATE_PORT(mod_network_nic_list).len; i++) {
+ if (MP_STATE_PORT(mod_network_nic_list).items[i] == nic) {
+ // nic already registered
+ return;
+ }
+ }
+ // nic not registered so add to list
+ mp_obj_list_append(MP_OBJ_FROM_PTR(&MP_STATE_PORT(mod_network_nic_list)), nic);
+}
+
+mp_obj_t network_module_find_nic(const uint8_t *ip) {
+ // find a NIC that is suited to given IP address
+ for (mp_uint_t i = 0; i < MP_STATE_PORT(mod_network_nic_list).len; i++) {
+ mp_obj_t nic = MP_STATE_PORT(mod_network_nic_list).items[i];
+ // TODO check IP suitability here
+ //mod_network_nic_type_t *nic_type = (mod_network_nic_type_t*)mp_obj_get_type(nic);
+ return nic;
+ }
+
+ nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, translate("no available NIC")));
+}
+
void network_module_create_random_mac_address(uint8_t *mac) {
uint32_t rb1 = shared_modules_random_getrandbits(24);
uint32_t rb2 = shared_modules_random_getrandbits(24);
@@ -40,4 +76,3 @@ void network_module_create_random_mac_address(uint8_t *mac) {
mac[4] = (uint8_t)(rb2 >> 8);
mac[5] = (uint8_t)(rb2);
}
-
diff --git a/shared-module/network/__init__.h b/shared-module/network/__init__.h
index 13f800fb0..ce5b4e6d3 100644
--- a/shared-module/network/__init__.h
+++ b/shared-module/network/__init__.h
@@ -3,6 +3,7 @@
*
* The MIT License (MIT)
*
+ * Copyright (c) 2013, 2014 Damien P. George
* Copyright (c) 2018 Nick Moore
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -26,3 +27,62 @@
void network_module_create_random_mac_address(uint8_t *mac);
+#ifndef MICROPY_INCLUDED_SHARED_MODULE_NETWORK___INIT___H
+#define MICROPY_INCLUDED_SHARED_MODULE_NETWORK___INIT___H
+
+#define MOD_NETWORK_IPADDR_BUF_SIZE (4)
+
+#define MOD_NETWORK_AF_INET (2)
+#define MOD_NETWORK_AF_INET6 (10)
+
+#define MOD_NETWORK_SOCK_STREAM (1)
+#define MOD_NETWORK_SOCK_DGRAM (2)
+#define MOD_NETWORK_SOCK_RAW (3)
+
+struct _mod_network_socket_obj_t;
+
+typedef struct _mod_network_nic_type_t {
+ mp_obj_type_t base;
+
+ // API for non-socket operations
+ int (*gethostbyname)(mp_obj_t nic, const char *name, mp_uint_t len, uint8_t *ip_out);
+
+ // API for socket operations; return -1 on error
+ int (*socket)(struct _mod_network_socket_obj_t *socket, int *_errno);
+ void (*close)(struct _mod_network_socket_obj_t *socket);
+ int (*bind)(struct _mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno);
+ int (*listen)(struct _mod_network_socket_obj_t *socket, mp_int_t backlog, int *_errno);
+ int (*accept)(struct _mod_network_socket_obj_t *socket, struct _mod_network_socket_obj_t *socket2, byte *ip, mp_uint_t *port, int *_errno);
+ int (*connect)(struct _mod_network_socket_obj_t *socket, byte *ip, mp_uint_t port, int *_errno);
+ mp_uint_t (*send)(struct _mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, int *_errno);
+ mp_uint_t (*recv)(struct _mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, int *_errno);
+ mp_uint_t (*sendto)(struct _mod_network_socket_obj_t *socket, const byte *buf, mp_uint_t len, byte *ip, mp_uint_t port, int *_errno);
+ mp_uint_t (*recvfrom)(struct _mod_network_socket_obj_t *socket, byte *buf, mp_uint_t len, byte *ip, mp_uint_t *port, int *_errno);
+ int (*setsockopt)(struct _mod_network_socket_obj_t *socket, mp_uint_t level, mp_uint_t opt, const void *optval, mp_uint_t optlen, int *_errno);
+ int (*settimeout)(struct _mod_network_socket_obj_t *socket, mp_uint_t timeout_ms, int *_errno);
+ int (*ioctl)(struct _mod_network_socket_obj_t *socket, mp_uint_t request, mp_uint_t arg, int *_errno);
+} mod_network_nic_type_t;
+
+typedef struct _mod_network_socket_obj_t {
+ mp_obj_base_t base;
+ mp_obj_t nic;
+ mod_network_nic_type_t *nic_type;
+ union {
+ struct {
+ uint8_t domain;
+ uint8_t type;
+ int8_t fileno;
+ } u_param;
+ mp_uint_t u_state;
+ };
+} mod_network_socket_obj_t;
+
+extern const mod_network_nic_type_t mod_network_nic_type_wiznet5k;
+extern const mod_network_nic_type_t mod_network_nic_type_cc3k;
+
+void network_module_init(void);
+void network_module_deinit(void);
+void network_module_register_nic(mp_obj_t nic);
+mp_obj_t network_module_find_nic(const uint8_t *ip);
+
+#endif // MICROPY_INCLUDED_SHARED_MODULE_NETWORK___INIT___H
generated by cgit v1.2.3 (git 2.39.1) at 2026-08-08 12:49:57 +0000