dev: refactor codebase.

Signed-off-by: Amlal <amlal@nekernel.org>

3 files changed, 89 insertions, 109 deletions

diff --git a/src/ppc64/ppc64-err.c b/src/ppc64/ppc64-err.c
index 13d944c..1ef0089 100644
--- a/src/ppc64/ppc64-err.c
+++ b/src/ppc64/ppc64-err.c
@@ -1,6 +1,6 @@
 /* -------------------------------------------

 

-	Copyright (C) 2024, Amlal EL Mahrouss, all rights reserved.

+  Copyright (C) 2024, Amlal EL Mahrouss, all rights reserved.

 

 ------------------------------------------- */

 

@@ -10,14 +10,12 @@
 

 /// @brief Goes into a panic state.

 /// @param reason why?

-void cb_panic(const char* reason)

-{

-	cb_put_string("Error: ");

-	cb_put_string(reason);

-	cb_put_char('\n');

+void cb_panic(const char* reason) {

+  cb_put_string("Error: ");

+  cb_put_string(reason);

+  cb_put_char('\n');

 

-	while (yes)

-	{

-		(void)0;

-	}

+  while (yes) {

+    (void) 0;

+  }

 }

diff --git a/src/ppc64/ppc64-hal.c b/src/ppc64/ppc64-hal.c
index f47f0b3..74d18c4 100644
--- a/src/ppc64/ppc64-hal.c
+++ b/src/ppc64/ppc64-hal.c
@@ -1,100 +1,87 @@
 /* -------------------------------------------

 

-	Copyright (C) 2024, Amlal EL Mahrouss, all rights reserved.

+  Copyright (C) 2024, Amlal EL Mahrouss, all rights reserved.

 

 ------------------------------------------- */

 

 #include <lib/ppc64/mmu.h>

 #include <lib/ppc64/processor.h>

 

-#include <lib/pci-tree.h>

 #include <lib/boot.h>

+#include <lib/pci-tree.h>

 

-void cb_write_tlb(uint32_t mas0, uint32_t mas1, uint32_t mas2, uint32_t mas3, uint32_t mas7)

-{

-	mtspr(MAS0, mas0);

-	mtspr(MAS1, mas1);

-	mtspr(MAS2, mas2);

-	mtspr(MAS3, mas3);

-	mtspr(MAS7, mas7);

+void cb_write_tlb(uint32_t mas0, uint32_t mas1, uint32_t mas2, uint32_t mas3, uint32_t mas7) {

+  mtspr(MAS0, mas0);

+  mtspr(MAS1, mas1);

+  mtspr(MAS2, mas2);

+  mtspr(MAS3, mas3);

+  mtspr(MAS7, mas7);

 

-	cb_flush_tlb();

+  cb_flush_tlb();

 }

 

-void cb_set_tlb(uint8_t	 tlb,

-				uint32_t epn,

-				uint64_t rpn,

-				uint8_t	 perms,

-				uint8_t	 wimge,

-				uint8_t	 ts,

-				uint8_t	 esel,

-				uint8_t	 tsize,

-				uint8_t	 iprot)

-{

-	if ((mfspr(SPRN_MMUCFG) & MMUCFG_MAVN) == MMUCFG_MAVN_V1 && (tsize & 1))

-	{

-		// this mmu-version does not allow odd tsize values

-		return;

-	}

-

-	uint32_t mas0 = FSL_BOOKE_MAS0(tlb, esel, 0);

-	uint32_t mas1 = FSL_BOOKE_MAS1(1, iprot, 0, ts, tsize);

-	uint32_t mas2 = FSL_BOOKE_MAS2(epn, wimge);

-	uint32_t mas3 = FSL_BOOKE_MAS3(rpn, 0, perms);

-	uint32_t mas7 = FSL_BOOKE_MAS7(rpn);

-

-	cb_write_tlb(mas0, mas1, mas2, mas3, mas7);

+void cb_set_tlb(uint8_t tlb, uint32_t epn, uint64_t rpn, uint8_t perms, uint8_t wimge, uint8_t ts,

+                uint8_t esel, uint8_t tsize, uint8_t iprot) {

+  if ((mfspr(SPRN_MMUCFG) & MMUCFG_MAVN) == MMUCFG_MAVN_V1 && (tsize & 1)) {

+    // this mmu-version does not allow odd tsize values

+    return;

+  }

+

+  uint32_t mas0 = FSL_BOOKE_MAS0(tlb, esel, 0);

+  uint32_t mas1 = FSL_BOOKE_MAS1(1, iprot, 0, ts, tsize);

+  uint32_t mas2 = FSL_BOOKE_MAS2(epn, wimge);

+  uint32_t mas3 = FSL_BOOKE_MAS3(rpn, 0, perms);

+  uint32_t mas7 = FSL_BOOKE_MAS7(rpn);

+

+  cb_write_tlb(mas0, mas1, mas2, mas3, mas7);

 }

 

 /// @brief Init hardware before jumping to kernel.

 /// @param

-void cb_init_hw(void)

-{

-

-	/// amlal:

-	/// map VGA framebuffer

-	cb_set_tlb(0, CB_FRAMEBUFFER_ADDR, /* v_addr, 0x0000A0000 */

-			   0x0000A000,			   /* p_addr. 0x0000A0000  */

-			   MAS3_SW | MAS3_SR,	   /* perm  type=TLB_MAP_IO */

-			   MAS2_I | MAS2_G,		   /* wimge type=TLB_MAP_IO */

-			   0,					   /* ts i.e AS=0 */

-			   1,					   /* esel (a.k.a tlb_index*/

-			   BOOKE_PAGESZ_64K,	   /* tsize  ie 2^10kB ie 1MB */

-			   1);

-

-	// map ccsrbar and uart.

-	// at start we execute from esel = 0, so chose something else..

-	cb_set_tlb(1, CB_UART_BASE,	  /* v_addr   0xe0000000 see  qemu-ppce500.h */

-			   0xfe0000000,		  /* p_addr. 0xfe0000000  */

-			   MAS3_SW | MAS3_SR, /* perm  type=TLB_MAP_IO */

-			   MAS2_I | MAS2_G,	  /* wimge type=TLB_MAP_IO */

-			   0,				  /* ts i.e AS=0 */

-			   2,				  /* esel (a.k.a tlb_index*/

-			   BOOKE_PAGESZ_1M,	  /* tsize  ie 2^10kB ie 1MB */

-			   1);

-

-	/// amlal:

-	/// map pci base for kernel

-	cb_set_tlb(0, CB_BASE_ADDRESS, /* v_addr, 0xFE008000 */

-			   0xFE0008000,		   /* p_addr. 0xfe0000000  */

-			   MAS3_SW | MAS3_SR,  /* perm  type=TLB_MAP_IO */

-			   MAS2_I | MAS2_G,	   /* wimge type=TLB_MAP_IO */

-			   0,				   /* ts i.e AS=0 */

-			   3,				   /* esel (a.k.a tlb_index*/

-			   BOOKE_PAGESZ_1M,	   /* tsize  ie 2^10kB ie 1MB */

-			   1);

-

-	cb_pci_init_tree();

-

-	cb_pci_append_tree("@fb", CB_FRAMEBUFFER_ADDR, 0x0);

-	cb_pci_append_tree("@mbci", 0x0, 0x0); // did not found a MBCI base for now...

-	cb_pci_append_tree("@serial", CB_UART_BASE, 0);

-	cb_pci_append_tree("@pci", CB_BASE_ADDRESS, 0x0);

-

-	cb_flush_tlb();

+void cb_init_hw(void) {

+  /// amlal:

+  /// map VGA framebuffer

+  cb_set_tlb(0, CB_FRAMEBUFFER_ADDR, /* v_addr, 0x0000A0000 */

+             0x0000A000,             /* p_addr. 0x0000A0000  */

+             MAS3_SW | MAS3_SR,      /* perm  type=TLB_MAP_IO */

+             MAS2_I | MAS2_G,        /* wimge type=TLB_MAP_IO */

+             0,                      /* ts i.e AS=0 */

+             1,                      /* esel (a.k.a tlb_index*/

+             BOOKE_PAGESZ_64K,       /* tsize  ie 2^10kB ie 1MB */

+             1);

+

+  // map ccsrbar and uart.

+  // at start we execute from esel = 0, so chose something else..

+  cb_set_tlb(1, CB_UART_BASE,   /* v_addr   0xe0000000 see  qemu-ppce500.h */

+             0xfe0000000,       /* p_addr. 0xfe0000000  */

+             MAS3_SW | MAS3_SR, /* perm  type=TLB_MAP_IO */

+             MAS2_I | MAS2_G,   /* wimge type=TLB_MAP_IO */

+             0,                 /* ts i.e AS=0 */

+             2,                 /* esel (a.k.a tlb_index*/

+             BOOKE_PAGESZ_1M,   /* tsize  ie 2^10kB ie 1MB */

+             1);

+

+  /// amlal:

+  /// map pci base for kernel

+  cb_set_tlb(0, CB_BASE_ADDRESS, /* v_addr, 0xFE008000 */

+             0xFE0008000,        /* p_addr. 0xfe0000000  */

+             MAS3_SW | MAS3_SR,  /* perm  type=TLB_MAP_IO */

+             MAS2_I | MAS2_G,    /* wimge type=TLB_MAP_IO */

+             0,                  /* ts i.e AS=0 */

+             3,                  /* esel (a.k.a tlb_index*/

+             BOOKE_PAGESZ_1M,    /* tsize  ie 2^10kB ie 1MB */

+             1);

+

+  cb_pci_init_tree();

+

+  cb_pci_append_tree("@fb", CB_FRAMEBUFFER_ADDR, 0x0);

+  cb_pci_append_tree("@mbci", 0x0, 0x0);  // did not found a MBCI base for now...

+  cb_pci_append_tree("@serial", CB_UART_BASE, 0);

+  cb_pci_append_tree("@pci", CB_BASE_ADDRESS, 0x0);

+

+  cb_flush_tlb();

 }

 

-void cb_flush_tlb(void)

-{

-	asm volatile("isync;tlbwe;msync;isync");

+void cb_flush_tlb(void) {

+  asm volatile("isync;tlbwe;msync;isync");

 };

diff --git a/src/ppc64/ppc64-uart.c b/src/ppc64/ppc64-uart.c
index c908eae..c16657d 100644
--- a/src/ppc64/ppc64-uart.c
+++ b/src/ppc64/ppc64-uart.c
@@ -1,48 +1,43 @@
 /* -------------------------------------------

 

-	Copyright (C) 2024, Amlal EL Mahrouss, all rights reserved.

+  Copyright (C) 2024, Amlal EL Mahrouss, all rights reserved.

 

 ------------------------------------------- */

 

-#include <lib/string.h>

 #include <lib/boot.h>

+#include <lib/string.h>

 

 /// BUGS: 0

 

 #define CB_NS16550_COM1 (CB_UART_BASE + 0x4500)

 #define CB_NS16550_COM2 (CB_UART_BASE + 0x4600)

 

-volatile ascii_char_t* const UART0DR = (ascii_char_t*)CB_NS16550_COM1;

+volatile ascii_char_t* const UART0DR = (ascii_char_t*) CB_NS16550_COM1;

 

 /* this file handles the UART */

 

 /// @brief Get character from UART.

 /// @param

 /// @return

-utf_char_t cb_get_char(void)

-{

-	while (!(*(((volatile uint8_t*)UART0DR) + 0x05) & 0x01))

-		;

-	return (utf_char_t)*UART0DR;

+utf_char_t cb_get_char(void) {

+  while (!(*(((volatile uint8_t*) UART0DR) + 0x05) & 0x01));

+  return (utf_char_t) *UART0DR;

 }

 

 /// @brief Put character into UART.

 /// @param ch

-void cb_put_char(utf_char_t ch)

-{

-	*UART0DR = (ascii_char_t)(ch);

+void cb_put_char(utf_char_t ch) {

+  *UART0DR = (ascii_char_t) (ch);

 }

 

 /// @brief Put string in UART.

 /// @param text the input text.

-size_t cb_put_string(const char* text)

-{

-	while (*text != '\0')

-	{ /* Loop until end of string */

+size_t cb_put_string(const char* text) {

+  while (*text != '\0') { /* Loop until end of string */

 

-		cb_put_char(*text); /* Transmit char */

+    cb_put_char(*text); /* Transmit char */

 

-		text++; /* Next char */

-	}

-	return 0;

+    text++; /* Next char */

+  }

+  return 0;

 }