Piraterna/aurix
2
1
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Transferred to UART communication

Browse source
This commit is contained in:
Jozef Nagy 2025-04-20 19:35:57 +02:00
parent 5c682c4209
commit 10ee4fcbd9
Signed by untrusted user who does not match committer: crz
GPG key ID: 459A4811CEAC7068
9 changed files with 33832 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

56
boot/arch/x86_64/common/uart/uart.c Normal file
View file

@ -0,0 +1,56 @@
/*********************************************************************************/
/* Module Name: uart.c */
/* Project: AurixOS */
/* */
/* Copyright (c) 2024-2025 Jozef Nagy */
/* */
/* This source is subject to the MIT License. */
/* See License.txt in the root of this repository. */
/* All other rights reserved. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR */
/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, */
/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE */
/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER */
/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, */
/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE */
/* SOFTWARE. */
/*********************************************************************************/
#include <stdint.h>
#include <arch/cpu/cpu.h>
#include <uart/uart.h>
#define COM1 0x3f8
void uart_init(uint16_t baud_rate)
{
uint8_t divisor = 115200 / baud_rate;
outb(COM1 + 1, 0x00);
outb(COM1 + 3, 0x80);
outb(COM1 + 0, divisor & 0xFF);
outb(COM1 + 1, (divisor >> 8) & 0xFF);
outb(COM1 + 3, 0x03);
outb(COM1 + 2, 0xC7);
outb(COM1 + 4, 0x0B);
outb(COM1 + 4, 0x0F);
}
void uart_send(char c)
{
while ((inb(COM1 + 5) & 0x20) == 0);
outb(COM1, c);
}
void uart_sendstr(char *str)
{
while (*str != '\0') {
if (*str == '\n') {
uart_send('\r');
}
uart_send(*str);
str++;
}
}

3
boot/common/init.c
View file

@ -17,12 +17,15 @@
/* SOFTWARE. */ /* SOFTWARE. */
/*********************************************************************************/ /*********************************************************************************/
#include <uart/uart.h>
#include <vfs/vfs.h> #include <vfs/vfs.h>
#include <ui/ui.h> #include <ui/ui.h>
#include <print.h> #include <print.h>
void axboot_init() void axboot_init()
{ {
uart_init(115200);
if (!vfs_init("\\")) { if (!vfs_init("\\")) {
debug("axboot_init(): Failed to mount boot drive! Halting...\n"); debug("axboot_init(): Failed to mount boot drive! Halting...\n");
// TODO: Halt // TODO: Halt

10
boot/common/print.c
View file

@ -26,6 +26,7 @@
#define NANOPRINTF_USE_WRITEBACK_FORMAT_SPECIFIERS 0 #define NANOPRINTF_USE_WRITEBACK_FORMAT_SPECIFIERS 0
#include <nanoprintf.h> #include <nanoprintf.h>
#include <uart/uart.h>
#include <print.h> #include <print.h>
#include <stddef.h> #include <stddef.h>
@ -46,10 +47,7 @@ void log(const char *fmt, ...)
npf_vsnprintf(buf, sizeof(buf), fmt, args); npf_vsnprintf(buf, sizeof(buf), fmt, args);
va_end(args); va_end(args);
// TODO: Get rid of this uart_sendstr(buf);
#ifdef AXBOOT_UEFI
printstr(buf);
#endif
} }
void debug(const char *fmt, ...) void debug(const char *fmt, ...)
@ -61,9 +59,7 @@ void debug(const char *fmt, ...)
npf_vsnprintf(buf, sizeof(buf), fmt, args); npf_vsnprintf(buf, sizeof(buf), fmt, args);
va_end(args); va_end(args);
#ifdef AXBOOT_UEFI uart_sendstr(buf);
printstr(buf);
#endif
} }
void snprintf(char *buf, size_t size, const char *fmt, ...) void snprintf(char *buf, size_t size, const char *fmt, ...)

2
boot/common/ui/ui.c
View file

@ -1,5 +1,5 @@
/*********************************************************************************/ /*********************************************************************************/
/* Module Name: gui.c */ /* Module Name: ui.c */
/* Project: AurixOS */ /* Project: AurixOS */
/* */ /* */
/* Copyright (c) 2024-2025 Jozef Nagy */ /* Copyright (c) 2024-2025 Jozef Nagy */

33701
boot/include/sounds/chime.h Normal file
View file

File diff suppressed because it is too large Load diff

22
boot/platform/uefi/print.c → boot/include/uart/uart.h
View file

@ -1,5 +1,5 @@
/*********************************************************************************/ /*********************************************************************************/
/* Module Name: print.c */ /* Module Name: uart.h */
/* Project: AurixOS */ /* Project: AurixOS */
/* */ /* */
/* Copyright (c) 2024-2025 Jozef Nagy */ /* Copyright (c) 2024-2025 Jozef Nagy */
@ -17,14 +17,14 @@
/* SOFTWARE. */ /* SOFTWARE. */
/*********************************************************************************/ /*********************************************************************************/
#include <lib/string.h> #ifndef _UART_UART_H
#include <efi.h> #define _UART_UART_H
#include <efilib.h>
void printstr(const char *str) #include <stdint.h>
{
CHAR16 wstr[4096]; void uart_init(uint16_t baud_rate);
mbstowcs(wstr, &str, strlen(str));
wstr[strlen(str)] = '\0'; void uart_send(char c);
gSystemTable->ConOut->OutputString(gSystemTable->ConOut, wstr); void uart_sendstr(char *str);
}
#endif /* _UART_UART_H */

19
boot/include/ui/framebuffer.h
View file

@ -1,3 +1,22 @@
/*********************************************************************************/
/* Module Name: framebuffer.h */
/* Project: AurixOS */
/* */
/* Copyright (c) 2024-2025 Jozef Nagy */
/* */
/* This source is subject to the MIT License. */
/* See License.txt in the root of this repository. */
/* All other rights reserved. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR */
/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, */
/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE */
/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER */
/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, */
/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE */
/* SOFTWARE. */
/*********************************************************************************/
#ifndef _UI_FRAMEBUFFER_H #ifndef _UI_FRAMEBUFFER_H
#define _UI_FRAMEBUFFER_H #define _UI_FRAMEBUFFER_H

19
boot/include/ui/ui.h
View file

@ -1,3 +1,22 @@
/*********************************************************************************/
/* Module Name: ui.h */
/* Project: AurixOS */
/* */
/* Copyright (c) 2024-2025 Jozef Nagy */
/* */
/* This source is subject to the MIT License. */
/* See License.txt in the root of this repository. */
/* All other rights reserved. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR */
/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, */
/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE */
/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER */
/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, */
/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE */
/* SOFTWARE. */
/*********************************************************************************/
#ifndef _UI_UI_H #ifndef _UI_UI_H
#define _UI_UI_H #define _UI_UI_H

19
boot/platform/uefi/ui/framebuffer.c
View file

@ -1,3 +1,22 @@
/*********************************************************************************/
/* Module Name: framebuffer.c */
/* Project: AurixOS */
/* */
/* Copyright (c) 2024-2025 Jozef Nagy */
/* */
/* This source is subject to the MIT License. */
/* See License.txt in the root of this repository. */
/* All other rights reserved. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR */
/* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, */
/* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE */
/* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER */
/* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, */
/* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE */
/* SOFTWARE. */
/*********************************************************************************/
#include <mm/mman.h> #include <mm/mman.h>
#include <ui/framebuffer.h> #include <ui/framebuffer.h>
#include <print.h> #include <print.h>