From 5494645e2607706655f8e3466f3ec858db303061 Mon Sep 17 00:00:00 2001 From: Christian Cunningham Date: Wed, 17 Aug 2022 22:22:56 -0700 Subject: Fix template --- Cargo.toml | 6 +++--- src/kernel.rs | 29 +++++++++++++++++++++++++++++ src/main.rs | 29 ----------------------------- 3 files changed, 32 insertions(+), 32 deletions(-) create mode 100644 src/kernel.rs delete mode 100644 src/main.rs diff --git a/Cargo.toml b/Cargo.toml index c3afac7..711d693 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "ghOSt" -version = "0.1.0" +version = "0.0.1" edition = "2021" -authors = [ "Sergey Bilovytskyy " ] +authors = [ "Christian Cunningham " ] [profile.release] lto = true @@ -13,6 +13,6 @@ bsp_rpi2 = [] [[bin]] name = "kernel" -path = "src/main.rs" +path = "src/kernel.rs" [dependencies] diff --git a/src/kernel.rs b/src/kernel.rs new file mode 100644 index 0000000..9697ca8 --- /dev/null +++ b/src/kernel.rs @@ -0,0 +1,29 @@ +//! Kernel Code + +#![allow(non_snake_case)] +#![allow(clippy::upper_case_acronyms,dead_code)] +#![feature(format_args_nl)] +#![feature(panic_info_message)] +#![feature(trait_alias)] +#![feature(exclusive_range_pattern)] +#![no_main] +#![no_std] + +mod cpu; +mod panic_wait; +mod uart; +use crate::uart::*; + +/// Initialization Code +unsafe fn kernel_init() -> ! { + uart_init(); + + kernel_main() +} + +fn kernel_main() -> ! { + write_char(b'a'); + write_char(b'b'); + loop { + } +} diff --git a/src/main.rs b/src/main.rs deleted file mode 100644 index 9697ca8..0000000 --- a/src/main.rs +++ /dev/null @@ -1,29 +0,0 @@ -//! Kernel Code - -#![allow(non_snake_case)] -#![allow(clippy::upper_case_acronyms,dead_code)] -#![feature(format_args_nl)] -#![feature(panic_info_message)] -#![feature(trait_alias)] -#![feature(exclusive_range_pattern)] -#![no_main] -#![no_std] - -mod cpu; -mod panic_wait; -mod uart; -use crate::uart::*; - -/// Initialization Code -unsafe fn kernel_init() -> ! { - uart_init(); - - kernel_main() -} - -fn kernel_main() -> ! { - write_char(b'a'); - write_char(b'b'); - loop { - } -} -- cgit v1.2.1