diff options
| author | Marvin Borner | 2021-04-25 13:43:14 +0200 |
|---|---|---|
| committer | Marvin Borner | 2021-04-25 13:43:14 +0200 |
| commit | f2b4acb2fe6a366288b19843e0d2678b8590bdf4 (patch) | |
| tree | 1eb869f237908ec0b2516c00f940c6562c5cc5bd /libs/libc/inc | |
| parent | cd46cefdd74b9ad0b225706f4d4b5864e87d97d6 (diff) | |
Chu chuu, using the bus for everything now!
Well, I know: bus != train. But I like trains. So I don't care.
Go away!
Diffstat (limited to 'libs/libc/inc')
| -rw-r--r-- | libs/libc/inc/assert.h | 17 | ||||
| -rw-r--r-- | libs/libc/inc/print.h | 5 | ||||
| -rw-r--r-- | libs/libc/inc/sys.h | 15 |
3 files changed, 27 insertions, 10 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); |