aboutsummaryrefslogtreecommitdiff
path: root/libs/libc
diff options
context:
space:
mode:
Diffstat (limited to 'libs/libc')
-rw-r--r--libs/libc/inc/assert.h17
-rw-r--r--libs/libc/inc/print.h5
-rw-r--r--libs/libc/inc/sys.h15
-rw-r--r--libs/libc/print.c59
-rw-r--r--libs/libc/rand.c (renamed from libs/libc/random.c)0
-rw-r--r--libs/libc/sys.c2
6 files changed, 61 insertions, 37 deletions
diff --git a/libs/libc/inc/assert.h b/libs/libc/inc/assert.h
index 9621e36..fb5a857 100644
--- a/libs/libc/inc/assert.h
+++ b/libs/libc/inc/assert.h
@@ -8,15 +8,20 @@
#ifdef KERNEL
#include <proc.h>
#define assert(exp) \
- if (!(exp)) { \
- printf("%s:%d: %s: Kernel assertion '%s' failed\n", __FILE__, __LINE__, __func__, \
- #exp); \
- __asm__ volatile("cli\nhlt"); \
+ { \
+ if (!(exp)) { \
+ printf("%s:%d: %s: Kernel assertion '%s' failed\n", __FILE__, __LINE__, \
+ __func__, #exp); \
+ __asm__ volatile("cli\nhlt"); \
+ } \
}
#elif defined(USER)
#define assert(exp) \
- if (!(exp)) \
- err(1, "%s:%d: %s: Assertion '%s' failed\n", __FILE__, __LINE__, __func__, #exp);
+ { \
+ if (!(exp)) \
+ err(1, "%s:%d: %s: Assertion '%s' failed\n", __FILE__, __LINE__, __func__, \
+ #exp); \
+ }
#endif
#endif
diff --git a/libs/libc/inc/print.h b/libs/libc/inc/print.h
index 1d85c33..6d959c3 100644
--- a/libs/libc/inc/print.h
+++ b/libs/libc/inc/print.h
@@ -14,13 +14,16 @@ int print(const char *str) NONNULL;
NORETURN void panic(const char *format, ...) NONNULL;
#ifdef USER
+#include <sys.h>
int vfprintf(const char *path, const char *format, va_list ap) NONNULL;
+int viprintf(enum io_type io, const char *format, va_list ap) NONNULL;
int fprintf(const char *path, const char *format, ...) NONNULL;
+int iprintf(enum io_type io, const char *format, ...) NONNULL;
int log(const char *format, ...) NONNULL;
void err(int code, const char *format, ...) NONNULL;
#else
#include <proc.h>
-int print_app(enum stream_defaults id, const char *proc_name, const char *str) NONNULL;
+int print_prefix(void);
void print_trace(u32 count);
#endif
diff --git a/libs/libc/inc/sys.h b/libs/libc/inc/sys.h
index 72a8029..8c8e217 100644
--- a/libs/libc/inc/sys.h
+++ b/libs/libc/inc/sys.h
@@ -15,6 +15,7 @@
#define SYS_BOOT_SHUTDOWN 0xdead
enum sys {
+ SYS_MIN,
SYS_ALLOC, // Allocate memory
SYS_SHACCESS, // Access shared memory
SYS_FREE, // Free memory
@@ -29,10 +30,12 @@ enum sys {
SYS_EXIT, // Exit current process
SYS_BOOT, // Boot functions (e.g. reboot/shutdown)
SYS_YIELD, // Switch to next process
+ SYS_MAX,
};
enum io_type {
IO_MIN,
+ IO_LOGGER,
IO_FRAMEBUFFER,
IO_NETWORK,
IO_KEYBOARD,
@@ -44,8 +47,14 @@ enum io_type {
// I/O control declarations
#define IOCTL_FB_GET 0
-#define IOCTL_BUS_CONNECT 0
-#define IOCTL_BUS_REGISTER 1
+#define IOCTL_BUS_CONNECT_BUS 0
+#define IOCTL_BUS_CONNECT_CONN 1
+#define IOCTL_BUS_REGISTER 2
+
+struct bus_header {
+ u32 conn;
+ // Data starts here
+};
struct event_keyboard {
u32 magic;
@@ -84,7 +93,7 @@ res exec(const char *path, ...) ATTR((nonnull(1))) SENTINEL;
res io_poll(enum io_type *devs) NONNULL;
res io_read(enum io_type io, void *buf, u32 offset, u32 count) NONNULL;
-res io_write(enum io_type io, void *buf, u32 offset, u32 count) NONNULL;
+res io_write(enum io_type io, const void *buf, u32 offset, u32 count) NONNULL;
res io_control(enum io_type io, ...);
res yield(void);
diff --git a/libs/libc/print.c b/libs/libc/print.c
index 27048bd..2d08fdb 100644
--- a/libs/libc/print.c
+++ b/libs/libc/print.c
@@ -7,6 +7,15 @@
#include <mem.h>
#include <str.h>
+#define RED "\x1B[1;31m"
+#define GRN "\x1B[1;32m"
+#define YEL "\x1B[1;33m"
+#define BLU "\x1B[1;34m"
+#define MAG "\x1B[1;35m"
+#define CYN "\x1B[1;36m"
+#define WHT "\x1B[1;37m"
+#define RES "\x1B[0m"
+
static void append(char *dest, char *src, int index)
{
for (u32 i = index; i < strlen(src) + index; i++)
@@ -98,13 +107,10 @@ int snprintf(char *str, u32 size, const char *format, ...)
#ifdef USER
#include <sys.h>
-#define PATH_OUT "/proc/self/io/out"
-#define PATH_LOG "/proc/self/io/log"
-#define PATH_ERR "/proc/self/io/err"
int vprintf(const char *format, va_list ap)
{
- return vfprintf(PATH_OUT, format, ap);
+ return viprintf(IO_LOGGER, format, ap);
}
int vfprintf(const char *path, const char *format, va_list ap)
@@ -114,6 +120,13 @@ int vfprintf(const char *path, const char *format, va_list ap)
return write(path, buf, 0, len);
}
+int viprintf(enum io_type io, const char *format, va_list ap)
+{
+ char buf[1024] = { 0 };
+ int len = vsnprintf(buf, sizeof(buf), format, ap);
+ return io_write(io, buf, 0, len);
+}
+
int fprintf(const char *path, const char *format, ...)
{
va_list ap;
@@ -124,6 +137,16 @@ int fprintf(const char *path, const char *format, ...)
return len;
}
+int iprintf(enum io_type io, const char *format, ...)
+{
+ va_list ap;
+ va_start(ap, format);
+ int len = viprintf(io, format, ap);
+ va_end(ap);
+
+ return len;
+}
+
int printf(const char *format, ...)
{
va_list ap;
@@ -138,7 +161,7 @@ int log(const char *format, ...)
{
va_list ap;
va_start(ap, format);
- int len = vfprintf(PATH_LOG, format, ap);
+ int len = viprintf(IO_LOGGER, format, ap);
va_end(ap);
return len;
@@ -150,14 +173,14 @@ NORETURN void err(int code, const char *format, ...)
log("ERRNO: %d (%s)\n", errno, strerror(errno));
va_list ap;
va_start(ap, format);
- vfprintf(PATH_ERR, format, ap);
+ viprintf(IO_LOGGER, format, ap);
va_end(ap);
exit(code);
}
int print(const char *str)
{
- return write(PATH_OUT, str, 0, strlen(str));
+ return io_write(IO_LOGGER, str, 0, strlen(str));
}
#else
@@ -169,15 +192,6 @@ int print(const char *str)
#include <proc.h>
#include <serial.h>
-#define RED "\x1B[1;31m"
-#define GRN "\x1B[1;32m"
-#define YEL "\x1B[1;33m"
-#define BLU "\x1B[1;34m"
-#define MAG "\x1B[1;35m"
-#define CYN "\x1B[1;36m"
-#define WHT "\x1B[1;37m"
-#define RES "\x1B[0m"
-
static void print_kernel(const char *str)
{
serial_print(RED);
@@ -204,18 +218,11 @@ int printf(const char *format, ...)
return len;
}
-int print_app(enum stream_defaults id, const char *proc_name, const char *str)
+int print_prefix(void)
{
- if (id == STREAM_LOG)
- serial_print(CYN "[LOG] to ");
- else if (id == STREAM_ERR)
- serial_print(YEL "[ERR] to ");
- serial_print(proc_name);
+ serial_print(CYN "[LOG] to ");
+ serial_print(proc_current()->name);
serial_print(": ");
- stac();
- serial_print(str);
- clac();
- serial_print(RES);
return 1;
}
diff --git a/libs/libc/random.c b/libs/libc/rand.c
index 268a21f..268a21f 100644
--- a/libs/libc/random.c
+++ b/libs/libc/rand.c
diff --git a/libs/libc/sys.c b/libs/libc/sys.c
index b0e6e93..cf2165a 100644
--- a/libs/libc/sys.c
+++ b/libs/libc/sys.c
@@ -138,7 +138,7 @@ res io_read(enum io_type io, void *buf, u32 offset, u32 count)
return sys4(SYS_IOREAD, (int)io, (int)buf, (int)offset, (int)count);
}
-res io_write(enum io_type io, void *buf, u32 offset, u32 count)
+res io_write(enum io_type io, const void *buf, u32 offset, u32 count)
{
return sys4(SYS_IOWRITE, (int)io, (int)buf, (int)offset, (int)count);
}