Split newlib syscall support to its own file

cores/rp2040/main.cpp

@@ -20,7 +20,6 @@
 
 #include <Arduino.h>
 #include "RP2040USB.h"
-#include <pico/stdlib.h>
 #include <pico/multicore.h>
 
 RP2040 rp2040;
@@ -94,141 +93,3 @@ extern "C" int main() {
     }
     return 0;
 }
-
-
-/* NEWLIB syscall overloads, so we can ::print() and ::getc() using our objects */
-/* Placed here to ensure this compilation unit will be present when it's time */
-/* to link newlib.a. */
-
-#include <stdint.h>
-#include <errno.h>
-#include <_syslist.h>
-#include <sys/times.h>
-#undef errno
-
-
-// TODO - check the fd, create a VFS, etc.
-
-extern "C" int errno;
-
-extern "C" ssize_t _write(int fd, const void *buf, size_t count) {
-#if defined DEBUG_RP2040_PORT
-    return DEBUG_RP2040_PORT.write((const char *)buf, count);
-#else
-    return 0;
-#endif
-}
-
-extern "C" int _chown (const char *path, uid_t owner, gid_t group) {
-    errno = ENOSYS;
-    return -1;
-}
-
-extern "C" int _close (int fildes) {
-    errno = ENOSYS;
-    return -1;
-}
-
-extern "C" int _execve (char  *name, char **argv, char **env) {
-    errno = ENOSYS;
-    return -1;
-}
-
-extern "C" int _fork (void) {
-    errno = ENOSYS;
-    return -1;
-}
-
-extern "C" int _fstat (int          fildes, struct stat *st) {
-    errno = ENOSYS;
-    return -1;
-}
-
-extern "C" int _getpid (void) {
-    errno = ENOSYS;
-    return -1;
-}
-
-
-static int64_t __timedelta_us = 0.0;
-
-extern "C" int _gettimeofday (struct timeval *tv, void *tz) {
-    uint64_t now_us = to_us_since_boot(get_absolute_time()) + __timedelta_us;
-    if (tv) {
-        tv->tv_sec = now_us / 1000000L;
-        tv->tv_usec = now_us % 1000000L;
-    }
-    return 0;
-}
-
-extern "C" int settimeofday (const struct timeval *tv, const struct timezone *tz) {
-    uint64_t now_us = to_us_since_boot(get_absolute_time());
-    if (tv) {
-        uint64_t newnow_us;
-        newnow_us = tv->tv_sec * 1000000L;
-        newnow_us += tv->tv_usec;
-        __timedelta_us = newnow_us - now_us;
-    }
-    return 0;
-}
-
-extern "C" int _isatty (int file) {
-    errno = ENOSYS;
-    return 0;
-}
-
-extern "C" int _kill (int pid, int sig) {
-    errno = ENOSYS;
-    return -1;
-}
-
-extern "C" int _link (char *existing, char *newlink) {
-    errno = ENOSYS;
-    return -1;
-}
-
-extern "C" int _lseek (int   file, int   ptr, int   dir) {
-    errno = ENOSYS;
-    return -1;
-}
-
-extern "C" int _open (char *file, int   flags, int   mode) {
-    errno = ENOSYS;
-    return -1;
-}
-
-extern "C" int _read (int   file, char *ptr, int   len)
-{
-//    return Serial.read(ptr, len);
-return -1;
-}
-
-extern "C" int _readlink (const char *path, char *buf, size_t bufsize) {
-    errno = ENOSYS;
-    return -1;
-}
-
-extern "C" int _stat (const char  *file, struct stat *st) {
-    errno = ENOSYS;
-    return -1;
-}
-
-extern "C" int _symlink (const char *path1, const char *path2) {
-    errno = ENOSYS;
-    return -1;
-}
-
-extern "C" clock_t _times (struct tms *buf) {
-    errno = ENOSYS;
-    return -1;
-}
-
-extern "C" int _unlink (char *name) {
-    errno = ENOSYS;
-    return -1;
-}
-
-extern "C" int _wait (int  *status) {
-    errno = ENOSYS;
-    return -1;
-}

cores/rp2040/posix.cpp

@@ -0,0 +1,155 @@
+/*
+ * NEWLIB syscall implementations
+ *
+ * Copyright (c) 2021 Earle F. Philhower, III <[email protected]>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <Arduino.h>
+#include <stdint.h>
+#include <errno.h>
+#include <_syslist.h>
+#include <sys/times.h>
+#include <pico/stdlib.h>
+#include <pico/multicore.h>
+
+#undef errno
+
+
+// TODO - check the fd, create a VFS, etc.
+
+extern "C" int errno;
+
+extern "C" ssize_t _write(int fd, const void *buf, size_t count) {
+#if defined DEBUG_RP2040_PORT
+    return DEBUG_RP2040_PORT.write((const char *)buf, count);
+#else
+    return 0;
+#endif
+}
+
+extern "C" int _chown (const char *path, uid_t owner, gid_t group) {
+    errno = ENOSYS;
+    return -1;
+}
+
+extern "C" int _close (int fildes) {
+    errno = ENOSYS;
+    return -1;
+}
+
+extern "C" int _execve (char  *name, char **argv, char **env) {
+    errno = ENOSYS;
+    return -1;
+}
+
+extern "C" int _fork (void) {
+    errno = ENOSYS;
+    return -1;
+}
+
+extern "C" int _fstat (int          fildes, struct stat *st) {
+    errno = ENOSYS;
+    return -1;
+}
+
+extern "C" int _getpid (void) {
+    errno = ENOSYS;
+    return -1;
+}
+
+static int64_t __timedelta_us = 0.0;
+
+extern "C" int _gettimeofday (struct timeval *tv, void *tz) {
+    uint64_t now_us = to_us_since_boot(get_absolute_time()) + __timedelta_us;
+    if (tv) {
+        tv->tv_sec = now_us / 1000000L;
+        tv->tv_usec = now_us % 1000000L;
+    }
+    return 0;
+}
+
+extern "C" int settimeofday (const struct timeval *tv, const struct timezone *tz) {
+    uint64_t now_us = to_us_since_boot(get_absolute_time());
+    if (tv) {
+        uint64_t newnow_us;
+        newnow_us = tv->tv_sec * 1000000L;
+        newnow_us += tv->tv_usec;
+        __timedelta_us = newnow_us - now_us;
+    }
+    return 0;
+}
+
+extern "C" int _isatty (int file) {
+    errno = ENOSYS;
+    return 0;
+}
+
+extern "C" int _kill (int pid, int sig) {
+    errno = ENOSYS;
+    return -1;
+}
+
+extern "C" int _link (char *existing, char *newlink) {
+    errno = ENOSYS;
+    return -1;
+}
+
+extern "C" int _lseek (int   file, int   ptr, int   dir) {
+    errno = ENOSYS;
+    return -1;
+}
+
+extern "C" int _open (char *file, int   flags, int   mode) {
+    errno = ENOSYS;
+    return -1;
+}
+
+extern "C" int _read (int   file, char *ptr, int   len)
+{
+//    return Serial.read(ptr, len);
+    return -1;
+}
+
+extern "C" int _readlink (const char *path, char *buf, size_t bufsize) {
+    errno = ENOSYS;
+    return -1;
+}
+
+extern "C" int _stat (const char  *file, struct stat *st) {
+    errno = ENOSYS;
+    return -1;
+}
+
+extern "C" int _symlink (const char *path1, const char *path2) {
+    errno = ENOSYS;
+    return -1;
+}
+
+extern "C" clock_t _times (struct tms *buf) {
+    errno = ENOSYS;
+    return -1;
+}
+
+extern "C" int _unlink (char *name) {
+    errno = ENOSYS;
+    return -1;
+}
+
+extern "C" int _wait (int  *status) {
+    errno = ENOSYS;
+    return -1;
+}