Merge pull request #20 from SummerGGift/2018_1_23

add usocket module weak links

port/genhdr/qstrdefs.generated.h

@@ -523,6 +523,14 @@ QDEF(MP_QSTR_setblocking, (const byte*)"\x6e\x0b" "setblocking")
 QDEF(MP_QSTR_calcsize, (const byte*)"\x4d\x08" "calcsize")
 QDEF(MP_QSTR_pack, (const byte*)"\xbc\x04" "pack")
 QDEF(MP_QSTR_pack_into, (const byte*)"\x1f\x09" "pack_into")
+QDEF(MP_QSTR_os, (const byte*)"\x79\x02" "os")
+QDEF(MP_QSTR_zlib, (const byte*)"\xf8\x04" "zlib")
+QDEF(MP_QSTR_hashlib, (const byte*)"\x10\x07" "hashlib")
+QDEF(MP_QSTR_binascii, (const byte*)"\x91\x08" "binascii")
+QDEF(MP_QSTR_collections, (const byte*)"\xe0\x0b" "collections")
+QDEF(MP_QSTR_re, (const byte*)"\xd2\x02" "re")
+QDEF(MP_QSTR_json, (const byte*)"\xfd\x04" "json")
+QDEF(MP_QSTR_heapq, (const byte*)"\x68\x05" "heapq")
 
 // This file was automatically generated by makeqstrdata.py
 
@@ -1413,7 +1421,6 @@ QDEF(MP_QSTR_and_, (const byte*)"\x91\x94\x04" "and_")
 QDEF(MP_QSTR_angle, (const byte*)"\x84\x2c\x05" "angle")
 QDEF(MP_QSTR_argv, (const byte*)"\xc7\xc6\x04" "argv")
 QDEF(MP_QSTR_bank, (const byte*)"\x83\x44\x04" "bank")
-QDEF(MP_QSTR_binascii, (const byte*)"\x91\x3c\x08" "binascii")
 QDEF(MP_QSTR_bl, (const byte*)"\xcb\x6e\x02" "bl")
 QDEF(MP_QSTR_board, (const byte*)"\x7f\xd4\x05" "board")
 QDEF(MP_QSTR_bootloader, (const byte*)"\xe2\xef\x0a" "bootloader")
@@ -1422,7 +1429,6 @@ QDEF(MP_QSTR_buffering, (const byte*)"\x25\xdb\x09" "buffering")
 QDEF(MP_QSTR_bx, (const byte*)"\xdf\x6e\x02" "bx")
 QDEF(MP_QSTR_callback, (const byte*)"\x4c\xf0\x08" "callback")
 QDEF(MP_QSTR_clz, (const byte*)"\x50\x4c\x03" "clz")
-QDEF(MP_QSTR_collections, (const byte*)"\xe0\xc8\x0b" "collections")
 QDEF(MP_QSTR_cpsie, (const byte*)"\xe9\xc7\x05" "cpsie")
 QDEF(MP_QSTR_cpu, (const byte*)"\xc3\x4d\x03" "cpu")
 QDEF(MP_QSTR_crc, (const byte*)"\x17\x4d\x03" "crc")
@@ -1444,7 +1450,6 @@ QDEF(MP_QSTR_gencall, (const byte*)"\x8b\x06\x07" "gencall")
 QDEF(MP_QSTR_handler, (const byte*)"\xdd\x5d\x07" "handler")
 QDEF(MP_QSTR_hard, (const byte*)"\xda\x70\x04" "hard")
 QDEF(MP_QSTR_have_cdc, (const byte*)"\x84\x08\x08" "have_cdc")
-QDEF(MP_QSTR_heapq, (const byte*)"\x68\x1d\x05" "heapq")
 QDEF(MP_QSTR_hid, (const byte*)"\xe0\x4f\x03" "hid")
 QDEF(MP_QSTR_hid_keyboard, (const byte*)"\x92\xb1\x0c" "hid_keyboard")
 QDEF(MP_QSTR_hid_mouse, (const byte*)"\x3e\x1e\x09" "hid_mouse")
@@ -1457,7 +1462,6 @@ QDEF(MP_QSTR_ipoll, (const byte*)"\x53\x5d\x05" "ipoll")
 QDEF(MP_QSTR_irq, (const byte*)"\x8f\x56\x03" "irq")
 QDEF(MP_QSTR_is_ready, (const byte*)"\x0b\x00\x08" "is_ready")
 QDEF(MP_QSTR_iterable, (const byte*)"\x25\x92\x08" "iterable")
-QDEF(MP_QSTR_json, (const byte*)"\xfd\xd1\x04" "json")
 QDEF(MP_QSTR_label, (const byte*)"\x43\xe7\x05" "label")
 QDEF(MP_QSTR_ldr, (const byte*)"\x5f\x40\x03" "ldr")
 QDEF(MP_QSTR_ldrb, (const byte*)"\x5d\x4c\x04" "ldrb")
@@ -1490,7 +1494,6 @@ QDEF(MP_QSTR_noise, (const byte*)"\x9b\xf4\x05" "noise")
 QDEF(MP_QSTR_nop, (const byte*)"\xb4\x57\x03" "nop")
 QDEF(MP_QSTR_nss, (const byte*)"\x2b\x5a\x03" "nss")
 QDEF(MP_QSTR_onewire, (const byte*)"\x28\xfc\x07" "onewire")
-QDEF(MP_QSTR_os, (const byte*)"\x79\x6f\x02" "os")
 QDEF(MP_QSTR_params, (const byte*)"\x79\xe2\x06" "params")
 QDEF(MP_QSTR_parity, (const byte*)"\x42\x05\x06" "parity")
 QDEF(MP_QSTR_path, (const byte*)"\x88\xce\x04" "path")
@@ -1512,7 +1515,6 @@ QDEF(MP_QSTR_pulse_width, (const byte*)"\x23\x14\x0b" "pulse_width")
 QDEF(MP_QSTR_pulse_width_percent, (const byte*)"\x27\xb7\x13" "pulse_width_percent")
 QDEF(MP_QSTR_pwm, (const byte*)"\x2f\x70\x03" "pwm")
 QDEF(MP_QSTR_rbit, (const byte*)"\xe8\xee\x04" "rbit")
-QDEF(MP_QSTR_re, (const byte*)"\xd2\x70\x02" "re")
 QDEF(MP_QSTR_read_buf_len, (const byte*)"\xa1\x09\x0c" "read_buf_len")
 QDEF(MP_QSTR_read_channel, (const byte*)"\xcb\xb6\x0c" "read_channel")
 QDEF(MP_QSTR_read_core_temp, (const byte*)"\xe0\xc2\x0e" "read_core_temp")

port/mpconfigport.h

@@ -240,18 +240,33 @@ extern const struct _mp_obj_module_t mp_module_usocket;
 #define MICROPY_PY_RTTHREAD_DEF
 #endif
 
+#if MICROPY_PY_USOCKET
+#define SOCKET_BUILTIN_MODULE               { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_usocket) },
+#define SOCKET_BUILTIN_MODULE_WEAK_LINKS    { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&mp_module_usocket) },
+#else
+#define SOCKET_BUILTIN_MODULE
+#define SOCKET_BUILTIN_MODULE_WEAK_LINKS
+#endif
+
 #define MICROPY_PORT_BUILTIN_MODULES \
     { MP_ROM_QSTR(MP_QSTR_machine), MP_ROM_PTR(&mp_module_machine) }, \
     { MP_ROM_QSTR(MP_QSTR_pyb), MP_ROM_PTR(&pyb_module) }, \
     MICROPY_PY_RTTHREAD_DEF \
     { MP_ROM_QSTR(MP_QSTR_uos), MP_ROM_PTR(&mp_module_uos) }, \
-    { MP_ROM_QSTR(MP_QSTR_usocket), MP_ROM_PTR(&mp_module_usocket) }, \
+    SOCKET_BUILTIN_MODULE \
 
 #define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
     { MP_ROM_QSTR(MP_QSTR_time), MP_ROM_PTR(&mp_module_time) }, \
     { MP_ROM_QSTR(MP_QSTR_os), MP_ROM_PTR(&mp_module_uos) }, \
-//    { MP_ROM_QSTR(MP_QSTR_socket), MP_ROM_PTR(&mp_module_usocket) }, \
-
+    SOCKET_BUILTIN_MODULE_WEAK_LINKS \
+    { MP_ROM_QSTR(MP_QSTR_struct), MP_ROM_PTR(&mp_module_ustruct) }, \
+    { MP_ROM_QSTR(MP_QSTR_binascii), MP_ROM_PTR(&mp_module_ubinascii) }, \
+    { MP_ROM_QSTR(MP_QSTR_collections), MP_ROM_PTR(&mp_module_collections) }, \
+    { MP_ROM_QSTR(MP_QSTR_re), MP_ROM_PTR(&mp_module_ure) }, \
+    { MP_ROM_QSTR(MP_QSTR_zlib), MP_ROM_PTR(&mp_module_uzlib) }, \
+    { MP_ROM_QSTR(MP_QSTR_json), MP_ROM_PTR(&mp_module_ujson) }, \
+    { MP_ROM_QSTR(MP_QSTR_heapq), MP_ROM_PTR(&mp_module_uheapq) }, \
+    { MP_ROM_QSTR(MP_QSTR_hashlib), MP_ROM_PTR(&mp_module_uhashlib) }, \
 
 #define MP_RTT_NOT_IMPL_PRINT rt_kprintf("Not implement on %s:%ld, Please add for your board!\n", __FILE__, __FUNCTION__)