all: Rename *umodule*.h to remove the "u" prefix.

This work was funded through GitHub Sponsors.

Also updates #includes.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>

25 files changed, 40 insertions, 39 deletions

diff --git a/extmod/moduplatform.h b/extmod/modplatform.h
index 7ca429778..95bf073fb 100644
--- a/extmod/moduplatform.h
+++ b/extmod/modplatform.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_MODUPLATFORM_H
-#define MICROPY_INCLUDED_MODUPLATFORM_H
+#ifndef MICROPY_INCLUDED_MODPLATFORM_H
+#define MICROPY_INCLUDED_MODPLATFORM_H
 
 #include "py/misc.h"  // For MP_STRINGIFY.
 #include "py/mpconfig.h"
@@ -102,4 +102,4 @@
 #define MICROPY_PLATFORM_VERSION ""
 #endif
 
-#endif // MICROPY_INCLUDED_MODUPLATFORM_H
+#endif // MICROPY_INCLUDED_MODPLATFORM_H
diff --git a/extmod/modutime.h b/extmod/modtime.h
index f5ea6b55b..f5ea6b55b 100644
--- a/extmod/modutime.h
+++ b/extmod/modtime.h
diff --git a/extmod/moduplatform.c b/extmod/moduplatform.c
index d5f919fc5..4d10bdb4d 100644
--- a/extmod/moduplatform.c
+++ b/extmod/moduplatform.c
@@ -29,7 +29,7 @@
 #include "py/objtuple.h"
 #include "py/objstr.h"
 #include "py/mphal.h"
-#include "extmod/moduplatform.h"
+#include "extmod/modplatform.h"
 #include "genhdr/mpversion.h"
 
 #if MICROPY_PY_PLATFORM
diff --git a/extmod/modutime.c b/extmod/modutime.c
index 1dfd7aa2c..163b874d5 100644
--- a/extmod/modutime.c
+++ b/extmod/modutime.c
@@ -28,7 +28,7 @@
 #include "py/mphal.h"
 #include "py/runtime.h"
 #include "py/smallint.h"
-#include "extmod/modutime.h"
+#include "extmod/modtime.h"
 
 #if MICROPY_PY_TIME
 
diff --git a/extmod/moduwebsocket.c b/extmod/moduwebsocket.c
index ac90dea8b..3bf50cc58 100644
--- a/extmod/moduwebsocket.c
+++ b/extmod/moduwebsocket.c
@@ -30,7 +30,7 @@
 
 #include "py/runtime.h"
 #include "py/stream.h"
-#include "extmod/moduwebsocket.h"
+#include "extmod/modwebsocket.h"
 
 #if MICROPY_PY_WEBSOCKET
 
diff --git a/extmod/moduwebsocket.h b/extmod/moduwebsocket.h
deleted file mode 100644
index c1ea291ed..000000000
--- a/extmod/moduwebsocket.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef MICROPY_INCLUDED_EXTMOD_MODUWEBSOCKET_H
-#define MICROPY_INCLUDED_EXTMOD_MODUWEBSOCKET_H
-
-#define FRAME_OPCODE_MASK 0x0f
-enum {
-    FRAME_CONT, FRAME_TXT, FRAME_BIN,
-    FRAME_CLOSE = 0x8, FRAME_PING, FRAME_PONG
-};
-
-#endif // MICROPY_INCLUDED_EXTMOD_MODUWEBSOCKET_H
diff --git a/extmod/modwebrepl.c b/extmod/modwebrepl.c
index d86f35896..64276b5a8 100644
--- a/extmod/modwebrepl.c
+++ b/extmod/modwebrepl.c
@@ -34,7 +34,7 @@
 #ifdef MICROPY_PY_WEBREPL_DELAY
 #include "py/mphal.h"
 #endif
-#include "extmod/moduwebsocket.h"
+#include "extmod/modwebsocket.h"
 
 #if MICROPY_PY_WEBREPL
 
diff --git a/extmod/modwebsocket.h b/extmod/modwebsocket.h
new file mode 100644
index 000000000..2720147df
--- /dev/null
+++ b/extmod/modwebsocket.h
@@ -0,0 +1,10 @@
+#ifndef MICROPY_INCLUDED_EXTMOD_MODWEBSOCKET_H
+#define MICROPY_INCLUDED_EXTMOD_MODWEBSOCKET_H
+
+#define FRAME_OPCODE_MASK 0x0f
+enum {
+    FRAME_CONT, FRAME_TXT, FRAME_BIN,
+    FRAME_CLOSE = 0x8, FRAME_PING, FRAME_PONG
+};
+
+#endif // MICROPY_INCLUDED_EXTMOD_MODWEBSOCKET_H
diff --git a/extmod/utime_mphal.h b/extmod/utime_mphal.h
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/extmod/utime_mphal.h
@@ -0,0 +1 @@
+
diff --git a/ports/cc3200/ftp/ftp.c b/ports/cc3200/ftp/ftp.c
index 173bb7c2c..5d4fc6fb5 100644
--- a/ports/cc3200/ftp/ftp.c
+++ b/ports/cc3200/ftp/ftp.c
@@ -42,13 +42,13 @@
 #include "simplelink.h"
 #include "modnetwork.h"
 #include "modwlan.h"
-#include "modusocket.h"
+#include "modsocket.h"
 #include "debug.h"
 #include "serverstask.h"
 #include "fifo.h"
 #include "socketfifo.h"
 #include "updater.h"
-#include "moduos.h"
+#include "modos.h"
 
 /******************************************************************************
  DEFINE PRIVATE CONSTANTS
diff --git a/ports/cc3200/hal/cc3200_hal.c b/ports/cc3200/hal/cc3200_hal.c
index 4694235ee..4d9d7647d 100644
--- a/ports/cc3200/hal/cc3200_hal.c
+++ b/ports/cc3200/hal/cc3200_hal.c
@@ -49,7 +49,7 @@
 #include "pybuart.h"
 #include "utils.h"
 #include "irq.h"
-#include "moduos.h"
+#include "modos.h"
 
 #ifdef USE_FREERTOS
 #include "FreeRTOS.h"
diff --git a/ports/cc3200/mods/modmachine.c b/ports/cc3200/mods/modmachine.c
index c5b06f507..a695fdcca 100644
--- a/ports/cc3200/mods/modmachine.c
+++ b/ports/cc3200/mods/modmachine.c
@@ -43,7 +43,7 @@
 #include "simplelink.h"
 #include "modnetwork.h"
 #include "modwlan.h"
-#include "moduos.h"
+#include "modos.h"
 #include "FreeRTOS.h"
 #include "portable.h"
 #include "task.h"
diff --git a/ports/cc3200/mods/moduos.h b/ports/cc3200/mods/modos.h
index f183715c9..5fa2a967d 100644
--- a/ports/cc3200/mods/moduos.h
+++ b/ports/cc3200/mods/modos.h
@@ -24,8 +24,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_CC3200_MODS_MODUOS_H
-#define MICROPY_INCLUDED_CC3200_MODS_MODUOS_H
+#ifndef MICROPY_INCLUDED_CC3200_MODS_MODOS_H
+#define MICROPY_INCLUDED_CC3200_MODS_MODOS_H
 
 #include "py/obj.h"
 
@@ -44,4 +44,4 @@ typedef struct _os_term_dup_obj_t {
  ******************************************************************************/
 void osmount_unmount_all (void);
 
-#endif // MICROPY_INCLUDED_CC3200_MODS_MODUOS_H
+#endif // MICROPY_INCLUDED_CC3200_MODS_MODOS_H
diff --git a/ports/cc3200/mods/modusocket.h b/ports/cc3200/mods/modsocket.h
index aaee04ce1..8eb4cb50a 100644
--- a/ports/cc3200/mods/modusocket.h
+++ b/ports/cc3200/mods/modsocket.h
@@ -23,8 +23,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#ifndef MICROPY_INCLUDED_CC3200_MODS_MODUSOCKET_H
-#define MICROPY_INCLUDED_CC3200_MODS_MODUSOCKET_H
+#ifndef MICROPY_INCLUDED_CC3200_MODS_MODSOCKET_H
+#define MICROPY_INCLUDED_CC3200_MODS_MODSOCKET_H
 
 #include "py/stream.h"
 
@@ -37,4 +37,4 @@ extern void modusocket_socket_delete (int16_t sd);
 extern void modusocket_enter_sleep (void);
 extern void modusocket_close_all_user_sockets (void);
 
-#endif // MICROPY_INCLUDED_CC3200_MODS_MODUSOCKET_H
+#endif // MICROPY_INCLUDED_CC3200_MODS_MODSOCKET_H
diff --git a/ports/cc3200/mods/moduos.c b/ports/cc3200/mods/moduos.c
index a6e4ef50a..7b1e8d79f 100644
--- a/ports/cc3200/mods/moduos.c
+++ b/ports/cc3200/mods/moduos.c
@@ -35,7 +35,7 @@
 #include "lib/oofatfs/ff.h"
 #include "lib/oofatfs/diskio.h"
 #include "genhdr/mpversion.h"
-#include "moduos.h"
+#include "modos.h"
 #include "sflash_diskio.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_fat.h"
diff --git a/ports/cc3200/mods/modusocket.c b/ports/cc3200/mods/modusocket.c
index 9b614c6d3..fd09cd6a4 100644
--- a/ports/cc3200/mods/modusocket.c
+++ b/ports/cc3200/mods/modusocket.c
@@ -37,7 +37,7 @@
 #include "py/mphal.h"
 #include "shared/netutils/netutils.h"
 #include "modnetwork.h"
-#include "modusocket.h"
+#include "modsocket.h"
 
 /******************************************************************************/
 // The following set of macros and functions provide a glue between the CC3100
diff --git a/ports/cc3200/mods/modussl.c b/ports/cc3200/mods/modussl.c
index dda6725e6..eb3aea1f8 100644
--- a/ports/cc3200/mods/modussl.c
+++ b/ports/cc3200/mods/modussl.c
@@ -32,7 +32,7 @@
 #include "py/objstr.h"
 #include "py/runtime.h"
 #include "modnetwork.h"
-#include "modusocket.h"
+#include "modsocket.h"
 
 /******************************************************************************
  DEFINE CONSTANTS
diff --git a/ports/cc3200/mods/modwlan.c b/ports/cc3200/mods/modwlan.c
index bf243ce7b..8d98dd042 100644
--- a/ports/cc3200/mods/modwlan.c
+++ b/ports/cc3200/mods/modwlan.c
@@ -38,7 +38,7 @@
 #include "shared/timeutils/timeutils.h"
 #include "shared/netutils/netutils.h"
 #include "modnetwork.h"
-#include "modusocket.h"
+#include "modsocket.h"
 #include "modwlan.h"
 #include "pybrtc.h"
 #include "debug.h"
diff --git a/ports/cc3200/mods/pybuart.c b/ports/cc3200/mods/pybuart.c
index 424ca251e..5d6ad0752 100644
--- a/ports/cc3200/mods/pybuart.c
+++ b/ports/cc3200/mods/pybuart.c
@@ -50,7 +50,7 @@
 #include "pin.h"
 #include "pybpin.h"
 #include "pins.h"
-#include "moduos.h"
+#include "modos.h"
 
 /// \moduleref pyb
 /// \class UART - duplex serial communication bus
diff --git a/ports/cc3200/mptask.c b/ports/cc3200/mptask.c
index a9dbf3c4c..abf8484b0 100644
--- a/ports/cc3200/mptask.c
+++ b/ports/cc3200/mptask.c
@@ -55,7 +55,7 @@
 #include "mperror.h"
 #include "simplelink.h"
 #include "modnetwork.h"
-#include "modusocket.h"
+#include "modsocket.h"
 #include "modwlan.h"
 #include "serverstask.h"
 #include "telnet.h"
@@ -70,7 +70,7 @@
 #include "cryptohash.h"
 #include "mpirq.h"
 #include "updater.h"
-#include "moduos.h"
+#include "modos.h"
 #include "antenna.h"
 #include "task.h"
 
diff --git a/ports/cc3200/serverstask.c b/ports/cc3200/serverstask.c
index 4d852447f..de782f5e7 100644
--- a/ports/cc3200/serverstask.c
+++ b/ports/cc3200/serverstask.c
@@ -37,7 +37,7 @@
 #include "telnet.h"
 #include "ftp.h"
 #include "pybwdt.h"
-#include "modusocket.h"
+#include "modsocket.h"
 #include "modnetwork.h"
 #include "modwlan.h"
 
diff --git a/ports/cc3200/telnet/telnet.c b/ports/cc3200/telnet/telnet.c
index df1fd1c22..86843c78f 100644
--- a/ports/cc3200/telnet/telnet.c
+++ b/ports/cc3200/telnet/telnet.c
@@ -33,7 +33,7 @@
 #include "simplelink.h"
 #include "modnetwork.h"
 #include "modwlan.h"
-#include "modusocket.h"
+#include "modsocket.h"
 #include "debug.h"
 #include "serverstask.h"
 #include "genhdr/mpversion.h"
diff --git a/ports/stm32/modpyb.c b/ports/stm32/modpyb.c
index b7d6fe7e6..831ece74a 100644
--- a/ports/stm32/modpyb.c
+++ b/ports/stm32/modpyb.c
@@ -54,7 +54,7 @@
 #include "modmachine.h"
 #include "extmod/modnetwork.h"
 #include "extmod/vfs.h"
-#include "extmod/modutime.h"
+#include "extmod/modtime.h"
 
 #if MICROPY_PY_PYB
 
diff --git a/ports/unix/main.c b/ports/unix/main.c
index 392ce59dd..16f663de1 100644
--- a/ports/unix/main.c
+++ b/ports/unix/main.c
@@ -48,7 +48,7 @@
 #include "py/mphal.h"
 #include "py/mpthread.h"
 #include "extmod/misc.h"
-#include "extmod/moduplatform.h"
+#include "extmod/modplatform.h"
 #include "extmod/vfs.h"
 #include "extmod/vfs_posix.h"
 #include "genhdr/mpversion.h"
diff --git a/py/modsys.c b/py/modsys.c
index 09bdfefc6..1cfc09ecf 100644
--- a/py/modsys.c
+++ b/py/modsys.c
@@ -36,7 +36,7 @@
 #include "py/smallint.h"
 #include "py/runtime.h"
 #include "py/persistentcode.h"
-#include "extmod/moduplatform.h"
+#include "extmod/modplatform.h"
 #include "genhdr/mpversion.h"
 
 #if MICROPY_PY_SYS_SETTRACE