juju/k-chow
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feat(serial): call init_serial in main

Browse Source 
Signed-off-by: Julien CLEMENT <julien.clement@epita.fr>
This commit is contained in:
Julien CLEMENT 2021-07-13 06:31:28 +02:00
parent e92cc8877f
commit 2fd5c536e0
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
k/k.c
View File

@ -25,7 +25,7 @@
#include "multiboot.h" #include "multiboot.h"
#include "stdio.h" #include "stdio.h"
#include "serial.h"
void k_main(unsigned long magic, multiboot_info_t *info) void k_main(unsigned long magic, multiboot_info_t *info)
{ {
@ -35,6 +35,8 @@ void k_main(unsigned long magic, multiboot_info_t *info)
char star[4] = "|/-\\"; char star[4] = "|/-\\";
char *fb = (void *)0xb8000; char *fb = (void *)0xb8000;
init_serial();
printf("bonjour\r\n"); printf("bonjour\r\n");
for (unsigned i = 0; ; ) { for (unsigned i = 0; ; ) {
*fb = star[i++ % 4]; *fb = star[i++ % 4];

2
k/serial.c
View File

@ -12,7 +12,7 @@ void set_baud_rate(void)
outb(COM1 + 3, line_control_register); outb(COM1 + 3, line_control_register);
} }
void serial_init(void) void init_serial(void)
{ {
outb(COM1 + 3, NO_PARITY | EIGHT_BITS_LENGTH); outb(COM1 + 3, NO_PARITY | EIGHT_BITS_LENGTH);
outb(COM1 + 2, FIFO | TRIGGER_LVL_14 | CLEAR_TRANSMIT_FIFO outb(COM1 + 2, FIFO | TRIGGER_LVL_14 | CLEAR_TRANSMIT_FIFO

2
k/serial.h
View File

@ -20,7 +20,7 @@
#define EMPTY_TRANSMITTER (0x1 << 5) #define EMPTY_TRANSMITTER (0x1 << 5)
void serial_init(void); void init_serial(void);
int write(const char *buf, size_t count); int write(const char *buf, size_t count);
#endif /* SERIAL_H */ #endif /* SERIAL_H */