From 54593c95f97eeed9d1165cc94b1afa54211e187d Mon Sep 17 00:00:00 2001
From: rick <rick@gnous.eu>
Date: Wed, 13 Sep 2023 16:05:29 +0200
Subject: [PATCH] fix bad command and name
---
framebuffer.c | 8 ++++----
framebuffer.h | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/framebuffer.c b/framebuffer.c
index 755a163..84c9370 100644
--- a/framebuffer.c
+++ b/framebuffer.c
@@ -3,15 +3,15 @@
void fb_write_cell(unsigned int i, char c, unsigned char fg, unsigned char bg)
{
- char *fb = (char*) 0xB8000; // adresse du framebuffer
+ char *fb = (char *) FB_ADDRESS;
*(fb + i) = c;
- *(fb + i + 1) = (fg & 0x0F) | ((bg & 0x0F) << 4);
+ *(fb + i + 1) = ((bg & 0x0F) << 4) | (fg & 0x0F);
}
void fb_move_cursor(unsigned short pos)
{
- outb(FB_COMMAND_PORT, FB_HIGH_BYTE_COMMAND);
+ outb(FB_ADDRESS_PORT, FB_HIGH_BYTE_COMMAND);
outb(FB_DATA_PORT, (pos >> 8) & 0x00FF);
- outb(FB_COMMAND_PORT, FB_HIGH_BYTE_COMMAND);
+ outb(FB_ADDRESS_PORT, FB_LOW_BYTE_COMMAND);
outb(FB_DATA_PORT, pos & 0x00FF);
}
diff --git a/framebuffer.h b/framebuffer.h
index 397e08a..a98fdc8 100644
--- a/framebuffer.h
+++ b/framebuffer.h
@@ -21,14 +21,14 @@
* @def FB_ADDRESS
* L'adresse mémoire du mode texte couleur du VGA.
*/
-#define FB_ADDRESS 0xB800
+#define FB_ADDRESS 0x000B8000
/**
- * @def FB_COMMAND_PORT
+ * @def FB_ADDRESS_PORT
* Le port pour pouvoir indiquer le sous-registre que l'on souhaite modifier
* dans le framebuffer VGA. Il s'agit du registre d'adresses.
*/
-#define FB_COMMAND_PORT 0x3D4
+#define FB_ADDRESS_PORT 0x3D4
/**
* @def FB_DATA_PORT