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>
This commit is contained in:
Jim Mussared 2022-08-18 15:07:24 +10:00
parent f5f9edf645
commit 0ceccd4cf8
25 changed files with 40 additions and 39 deletions

View File

@ -23,8 +23,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef MICROPY_INCLUDED_MODUPLATFORM_H #ifndef MICROPY_INCLUDED_MODPLATFORM_H
#define MICROPY_INCLUDED_MODUPLATFORM_H #define MICROPY_INCLUDED_MODPLATFORM_H
#include "py/misc.h" // For MP_STRINGIFY. #include "py/misc.h" // For MP_STRINGIFY.
#include "py/mpconfig.h" #include "py/mpconfig.h"
@ -102,4 +102,4 @@
#define MICROPY_PLATFORM_VERSION "" #define MICROPY_PLATFORM_VERSION ""
#endif #endif
#endif // MICROPY_INCLUDED_MODUPLATFORM_H #endif // MICROPY_INCLUDED_MODPLATFORM_H

View File

@ -29,7 +29,7 @@
#include "py/objtuple.h" #include "py/objtuple.h"
#include "py/objstr.h" #include "py/objstr.h"
#include "py/mphal.h" #include "py/mphal.h"
#include "extmod/moduplatform.h" #include "extmod/modplatform.h"
#include "genhdr/mpversion.h" #include "genhdr/mpversion.h"
#if MICROPY_PY_PLATFORM #if MICROPY_PY_PLATFORM

View File

@ -28,7 +28,7 @@
#include "py/mphal.h" #include "py/mphal.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "py/smallint.h" #include "py/smallint.h"
#include "extmod/modutime.h" #include "extmod/modtime.h"
#if MICROPY_PY_TIME #if MICROPY_PY_TIME

View File

@ -30,7 +30,7 @@
#include "py/runtime.h" #include "py/runtime.h"
#include "py/stream.h" #include "py/stream.h"
#include "extmod/moduwebsocket.h" #include "extmod/modwebsocket.h"
#if MICROPY_PY_WEBSOCKET #if MICROPY_PY_WEBSOCKET

View File

@ -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

View File

@ -34,7 +34,7 @@
#ifdef MICROPY_PY_WEBREPL_DELAY #ifdef MICROPY_PY_WEBREPL_DELAY
#include "py/mphal.h" #include "py/mphal.h"
#endif #endif
#include "extmod/moduwebsocket.h" #include "extmod/modwebsocket.h"
#if MICROPY_PY_WEBREPL #if MICROPY_PY_WEBREPL

10
extmod/modwebsocket.h Normal file
View File

@ -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

1
extmod/utime_mphal.h Normal file
View File

@ -0,0 +1 @@

View File

@ -42,13 +42,13 @@
#include "simplelink.h" #include "simplelink.h"
#include "modnetwork.h" #include "modnetwork.h"
#include "modwlan.h" #include "modwlan.h"
#include "modusocket.h" #include "modsocket.h"
#include "debug.h" #include "debug.h"
#include "serverstask.h" #include "serverstask.h"
#include "fifo.h" #include "fifo.h"
#include "socketfifo.h" #include "socketfifo.h"
#include "updater.h" #include "updater.h"
#include "moduos.h" #include "modos.h"
/****************************************************************************** /******************************************************************************
DEFINE PRIVATE CONSTANTS DEFINE PRIVATE CONSTANTS

View File

@ -49,7 +49,7 @@
#include "pybuart.h" #include "pybuart.h"
#include "utils.h" #include "utils.h"
#include "irq.h" #include "irq.h"
#include "moduos.h" #include "modos.h"
#ifdef USE_FREERTOS #ifdef USE_FREERTOS
#include "FreeRTOS.h" #include "FreeRTOS.h"

View File

@ -43,7 +43,7 @@
#include "simplelink.h" #include "simplelink.h"
#include "modnetwork.h" #include "modnetwork.h"
#include "modwlan.h" #include "modwlan.h"
#include "moduos.h" #include "modos.h"
#include "FreeRTOS.h" #include "FreeRTOS.h"
#include "portable.h" #include "portable.h"
#include "task.h" #include "task.h"

View File

@ -24,8 +24,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef MICROPY_INCLUDED_CC3200_MODS_MODUOS_H #ifndef MICROPY_INCLUDED_CC3200_MODS_MODOS_H
#define MICROPY_INCLUDED_CC3200_MODS_MODUOS_H #define MICROPY_INCLUDED_CC3200_MODS_MODOS_H
#include "py/obj.h" #include "py/obj.h"
@ -44,4 +44,4 @@ typedef struct _os_term_dup_obj_t {
******************************************************************************/ ******************************************************************************/
void osmount_unmount_all (void); void osmount_unmount_all (void);
#endif // MICROPY_INCLUDED_CC3200_MODS_MODUOS_H #endif // MICROPY_INCLUDED_CC3200_MODS_MODOS_H

View File

@ -23,8 +23,8 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#ifndef MICROPY_INCLUDED_CC3200_MODS_MODUSOCKET_H #ifndef MICROPY_INCLUDED_CC3200_MODS_MODSOCKET_H
#define MICROPY_INCLUDED_CC3200_MODS_MODUSOCKET_H #define MICROPY_INCLUDED_CC3200_MODS_MODSOCKET_H
#include "py/stream.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_enter_sleep (void);
extern void modusocket_close_all_user_sockets (void); extern void modusocket_close_all_user_sockets (void);
#endif // MICROPY_INCLUDED_CC3200_MODS_MODUSOCKET_H #endif // MICROPY_INCLUDED_CC3200_MODS_MODSOCKET_H

View File

@ -35,7 +35,7 @@
#include "lib/oofatfs/ff.h" #include "lib/oofatfs/ff.h"
#include "lib/oofatfs/diskio.h" #include "lib/oofatfs/diskio.h"
#include "genhdr/mpversion.h" #include "genhdr/mpversion.h"
#include "moduos.h" #include "modos.h"
#include "sflash_diskio.h" #include "sflash_diskio.h"
#include "extmod/vfs.h" #include "extmod/vfs.h"
#include "extmod/vfs_fat.h" #include "extmod/vfs_fat.h"

View File

@ -37,7 +37,7 @@
#include "py/mphal.h" #include "py/mphal.h"
#include "shared/netutils/netutils.h" #include "shared/netutils/netutils.h"
#include "modnetwork.h" #include "modnetwork.h"
#include "modusocket.h" #include "modsocket.h"
/******************************************************************************/ /******************************************************************************/
// The following set of macros and functions provide a glue between the CC3100 // The following set of macros and functions provide a glue between the CC3100

View File

@ -32,7 +32,7 @@
#include "py/objstr.h" #include "py/objstr.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "modnetwork.h" #include "modnetwork.h"
#include "modusocket.h" #include "modsocket.h"
/****************************************************************************** /******************************************************************************
DEFINE CONSTANTS DEFINE CONSTANTS

View File

@ -38,7 +38,7 @@
#include "shared/timeutils/timeutils.h" #include "shared/timeutils/timeutils.h"
#include "shared/netutils/netutils.h" #include "shared/netutils/netutils.h"
#include "modnetwork.h" #include "modnetwork.h"
#include "modusocket.h" #include "modsocket.h"
#include "modwlan.h" #include "modwlan.h"
#include "pybrtc.h" #include "pybrtc.h"
#include "debug.h" #include "debug.h"

View File

@ -50,7 +50,7 @@
#include "pin.h" #include "pin.h"
#include "pybpin.h" #include "pybpin.h"
#include "pins.h" #include "pins.h"
#include "moduos.h" #include "modos.h"
/// \moduleref pyb /// \moduleref pyb
/// \class UART - duplex serial communication bus /// \class UART - duplex serial communication bus

View File

@ -55,7 +55,7 @@
#include "mperror.h" #include "mperror.h"
#include "simplelink.h" #include "simplelink.h"
#include "modnetwork.h" #include "modnetwork.h"
#include "modusocket.h" #include "modsocket.h"
#include "modwlan.h" #include "modwlan.h"
#include "serverstask.h" #include "serverstask.h"
#include "telnet.h" #include "telnet.h"
@ -70,7 +70,7 @@
#include "cryptohash.h" #include "cryptohash.h"
#include "mpirq.h" #include "mpirq.h"
#include "updater.h" #include "updater.h"
#include "moduos.h" #include "modos.h"
#include "antenna.h" #include "antenna.h"
#include "task.h" #include "task.h"

View File

@ -37,7 +37,7 @@
#include "telnet.h" #include "telnet.h"
#include "ftp.h" #include "ftp.h"
#include "pybwdt.h" #include "pybwdt.h"
#include "modusocket.h" #include "modsocket.h"
#include "modnetwork.h" #include "modnetwork.h"
#include "modwlan.h" #include "modwlan.h"

View File

@ -33,7 +33,7 @@
#include "simplelink.h" #include "simplelink.h"
#include "modnetwork.h" #include "modnetwork.h"
#include "modwlan.h" #include "modwlan.h"
#include "modusocket.h" #include "modsocket.h"
#include "debug.h" #include "debug.h"
#include "serverstask.h" #include "serverstask.h"
#include "genhdr/mpversion.h" #include "genhdr/mpversion.h"

View File

@ -54,7 +54,7 @@
#include "modmachine.h" #include "modmachine.h"
#include "extmod/modnetwork.h" #include "extmod/modnetwork.h"
#include "extmod/vfs.h" #include "extmod/vfs.h"
#include "extmod/modutime.h" #include "extmod/modtime.h"
#if MICROPY_PY_PYB #if MICROPY_PY_PYB

View File

@ -48,7 +48,7 @@
#include "py/mphal.h" #include "py/mphal.h"
#include "py/mpthread.h" #include "py/mpthread.h"
#include "extmod/misc.h" #include "extmod/misc.h"
#include "extmod/moduplatform.h" #include "extmod/modplatform.h"
#include "extmod/vfs.h" #include "extmod/vfs.h"
#include "extmod/vfs_posix.h" #include "extmod/vfs_posix.h"
#include "genhdr/mpversion.h" #include "genhdr/mpversion.h"

View File

@ -36,7 +36,7 @@
#include "py/smallint.h" #include "py/smallint.h"
#include "py/runtime.h" #include "py/runtime.h"
#include "py/persistentcode.h" #include "py/persistentcode.h"
#include "extmod/moduplatform.h" #include "extmod/modplatform.h"
#include "genhdr/mpversion.h" #include "genhdr/mpversion.h"
#if MICROPY_PY_SYS_SETTRACE #if MICROPY_PY_SYS_SETTRACE