summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJake Mannens <jake72360@gmail.com>2018-09-01 02:27:36 +1000
committerJake Mannens <jake72360@gmail.com>2018-09-01 02:27:36 +1000
commit6d87016287ea76afbdf7e16fb2cf9e4fa20cc0de (patch)
tree9c2ed07925bc89ff3da3d275a6d29d80bb91d955 /include
parent307eaac66d378c1f6150519123ec1204277464d9 (diff)
Removed the sys_puts system call in favour of calls to tty_write().
Removed the rsputs() function in favour of calls to tty_write(). Corrected a bug in the serial driver and TTY subsystem where a full buffer wouldn't be detected. This was caused by a missing set of brackets on several operations involving the modulus operator. Added the ability for the serial driver to automatically take data from the TTY device's write buffer and push it to the serial port. This can happen in one of two ways; 1) the TTY subsystem notifies the serial driver of new data by calling the write() function pointer in the tty_struct or, 2) the serial port issues an interrupt signalling that it has finished sending data prompting the driver to check the buffers for any more pending data.
Diffstat (limited to 'include')
-rw-r--r--include/kernel/serial.h2
-rw-r--r--include/kernel/sys.h28
-rw-r--r--include/unistd.h23
3 files changed, 25 insertions, 28 deletions
diff --git a/include/kernel/serial.h b/include/kernel/serial.h
index 6ac5d65..beb0891 100644
--- a/include/kernel/serial.h
+++ b/include/kernel/serial.h
@@ -6,8 +6,6 @@
extern struct tty_struct tty_rs;
-int rsputs(char*);
-
ssize_t rsread(void*, size_t);
void serial_init(void);
diff --git a/include/kernel/sys.h b/include/kernel/sys.h
index e5275cf..1b8be8e 100644
--- a/include/kernel/sys.h
+++ b/include/kernel/sys.h
@@ -1,6 +1,6 @@
typedef int (*syscall_t) (void);
-extern int sys_puts(void);
+extern int sys_time(void);
extern int sys_time(void);
extern int sys_getpid(void);
extern int sys_getpdir(void);
@@ -11,22 +11,22 @@ extern int sys_ctty(void);
extern int sys_read(void);
extern int sys_write(void);
extern int sys_kill(void);
-extern int sys_dummy(void);
extern int sys_panic(void);
+extern int sys_dummy(void);
syscall_t call_table[256] = {
- [0] = &sys_puts,
- [1] = &sys_time,
- [2] = &sys_getpid,
- [3] = &sys_getpdir,
- [4] = &sys_signal,
- [5] = &sys_alarm,
- [6] = &sys_pause,
- [7] = &sys_ctty,
- [8] = &sys_read,
- [9] = &sys_write,
- [10] = &sys_kill,
- [11] = &sys_panic,
+ [0] = &sys_time,
+ [1] = &sys_getpid,
+ [2] = &sys_getpdir,
+ [3] = &sys_signal,
+ [4] = &sys_alarm,
+ [5] = &sys_pause,
+ [6] = &sys_ctty,
+ [7] = &sys_read,
+ [8] = &sys_write,
+ [9] = &sys_kill,
+ [10] = &sys_panic,
+ [11] = &sys_dummy,
[12] = &sys_dummy,
[13] = &sys_dummy,
[14] = &sys_dummy,
diff --git a/include/unistd.h b/include/unistd.h
index a7e4f32..cc0f766 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -10,18 +10,17 @@ typedef int32_t ssize_t;
typedef int16_t pid_t;
-#define __SYS_puts 0
-#define __SYS_time 1
-#define __SYS_getpid 2
-#define __SYS_getpdir 3
-#define __SYS_signal 4
-#define __SYS_alarm 5
-#define __SYS_pause 6
-#define __SYS_ctty 7
-#define __SYS_read 8
-#define __SYS_write 9
-#define __SYS_kill 10
-#define __SYS_panic 11
+#define __SYS_time 0
+#define __SYS_getpid 1
+#define __SYS_getpdir 2
+#define __SYS_signal 3
+#define __SYS_alarm 4
+#define __SYS_pause 5
+#define __SYS_ctty 6
+#define __SYS_read 7
+#define __SYS_write 8
+#define __SYS_kill 9
+#define __SYS_panic 10
#define _syscall0(type, name) \
type name(void) { \