fix vga text output logic

Author: tas0dev

OFL-LICENSE LICENSE-OFLOFL-LICENSE renamed to LICENSE-OFL

@@ -22,9 +22,9 @@
 
 /* Boot Protocol Keyboard Report */
 struct hid_keyboard_report {
-	uint8_t modifier; /* Ctrl, Shift, Alt, GUI */
+	uint8_t modifier; /* Ctrl, Shift, Alt, */
 	uint8_t reserved;
-	uint8_t keycode[6]; /* 同時押し可能なキー（最大6個） */
+	uint8_t keycode[64]; /* 同時押し可能なキー（最大64個） */
 } __attribute__((packed));
 
 /* Modifier bits */

src/kernel/driver/usb/hid.h

@@ -1,11 +1,3 @@
-/**
- * @file xhci.c
- * @brief xHCI (eXtensible Host Controller Interface) USB 3.0 Driver
- * 
- * xHCI仕様に基づくUSBホストコントローラドライバ
- * Phase 1: コントローラ検出と基本初期化
- */
-
 #include <driver/usb/xhci.h>
 #include <device/pci.h>
 #include <util/console.h>

src/kernel/driver/usb/xhci.c

@@ -247,40 +247,30 @@ int xhci_init(void);
 int xhci_reset_controller(struct xhci_hc *hc);
 int xhci_start_controller(struct xhci_hc *hc);
 uint32_t xhci_get_port_status(struct xhci_hc *hc, uint32_t port_num);
-
-/* Phase 2: Command/Event Ring functions */
 int xhci_setup_command_ring(struct xhci_hc *hc);
 int xhci_setup_event_ring(struct xhci_hc *hc);
 void xhci_ring_doorbell(struct xhci_hc *hc, uint8_t slot_id, uint8_t target);
 int xhci_wait_for_event(struct xhci_hc *hc, struct xhci_trb *event_trb,
 			uint32_t timeout_ms);
 void xhci_handle_events(struct xhci_hc *hc);
-
-/* Phase 3: Device Enumeration functions */
 int xhci_enable_slot(struct xhci_hc *hc);
 int xhci_address_device(struct xhci_hc *hc, uint8_t slot_id, uint8_t port);
 int xhci_configure_endpoint(struct xhci_hc *hc, uint8_t slot_id);
 int xhci_reset_port(struct xhci_hc *hc, uint8_t port);
 void xhci_handle_port_status_change(struct xhci_hc *hc, uint8_t port);
-
-/* Phase 4: USB Protocol functions */
 int xhci_control_transfer(struct xhci_hc *hc, uint8_t slot_id,
 			  uint8_t request_type, uint8_t request, uint16_t value,
 			  uint16_t index, void *data, uint16_t length);
 int xhci_get_descriptor(struct xhci_hc *hc, uint8_t slot_id, uint8_t desc_type,
 			uint8_t desc_index, void *buffer, uint16_t length);
 int xhci_set_configuration(struct xhci_hc *hc, uint8_t slot_id,
 			   uint8_t config_value);
-
-/* Helper functions */
 void *xhci_alloc_aligned(uint32_t size, uint32_t alignment);
 void xhci_free_aligned(void *ptr);
 uint8_t xhci_get_keyboard_slot(struct xhci_hc *hc);
 int xhci_setup_keyboard_polling(struct xhci_hc *hc, uint8_t slot_id);
 int xhci_poll_keyboard(struct xhci_hc *hc, uint8_t slot_id,
 		       uint8_t *report_buffer);
-
-/* HID Keyboard specific */
 int xhci_configure_keyboard(struct xhci_hc *hc, uint8_t slot_id);
 int xhci_set_boot_protocol(struct xhci_hc *hc, uint8_t slot_id,
 			   uint8_t interface);

src/kernel/driver/usb/xhci.h

@@ -37,8 +37,8 @@ static BOOT_INFO *g_boot_info = NULL;
 void kmain(BOOT_INFO *boot_info) {
 	g_boot_info = boot_info;
 
-	console_init();
 	console_set_framebuffer(boot_info);
+	console_init();
 	set_log_level(ALL);
 
 	gdt_build();
@@ -104,4 +104,4 @@ void kloop() {
 	if (!activity) {
 		cpu_halt();
 	}
-}
+}

src/kernel/main.c

@@ -135,13 +135,19 @@ static int parse_bdf(const char *data, size_t size) {
 				printk("BDF: Too many glyphs\n");
 				return 0;
 			}
+                        
 			current_glyph = &font.glyphs[font.num_glyphs];
 			current_glyph->width = font.width;
 			current_glyph->height = font.height;
 			current_glyph->x_offset = 0;
 			current_glyph->y_offset = 0;
 			current_glyph->encoding = 0;
 			bitmap_line = 0;
+
+                        for (int zi = 0; zi < MAX_GLYPH_HEIGHT; zi++) {
+                                current_glyph->bitmap[zi] = 0;
+                        }
+
 			in_bitmap = 0;
 		} else if (starts_with(p, "ENCODING")) {
 			if (current_glyph) {
@@ -180,23 +186,28 @@ static int parse_bdf(const char *data, size_t size) {
 			}
 			in_bitmap = 0;
 		} else if (in_bitmap && current_glyph) {
-			// ビットマップデータを読み込む
 			p = skip_spaces(p);
-			if ((*p >= '0' && *p <= '9') ||
-			    (*p >= 'A' && *p <= 'F') ||
-			    (*p >= 'a' && *p <= 'f')) {
+			if ((*p >= '0' && *p <= '9') || (*p >= 'A' && *p <= 'F') ||
+				(*p >= 'a' && *p <= 'f')) {
 				if (bitmap_line < MAX_GLYPH_HEIGHT) {
-					char hex_str[3] = { 0 };
+					char hex_str[9];
 					int i = 0;
-					while (i < 2 &&
-					       ((*p >= '0' && *p <= '9') ||
-						(*p >= 'A' && *p <= 'F') ||
-						(*p >= 'a' && *p <= 'f'))) {
+					while (i < (int)(sizeof(hex_str) - 1) &&
+						   ((*p >= '0' && *p <= '9') || (*p >= 'A' && *p <= 'F') ||
+							(*p >= 'a' && *p <= 'f'))) {
 						hex_str[i++] = *p++;
 					}
 					hex_str[i] = '\0';
-					current_glyph->bitmap[bitmap_line++] =
-						hex_to_int(hex_str);
+					uint32_t val = hex_to_int(hex_str);
+					int hex_len = i;
+					int total_bits = hex_len * 4;
+					int width = current_glyph->width ? current_glyph->width : font.width;
+					if (width <= 0) width = font.width;
+					if (total_bits > width) {
+						val >>= (total_bits - width);
+					}
+					uint32_t mask = (width >= 32) ? 0xFFFFFFFFu : ((1u << width) - 1u);
+					current_glyph->bitmap[bitmap_line++] = (uint16_t)(val & mask);
 				}
 			}
 		}

src/kernel/util/bdf.c

@@ -15,7 +15,7 @@ typedef struct {
 	uint8_t height; // グリフの高さ
 	int8_t x_offset; // X方向のオフセット
 	int8_t y_offset; // Y方向のオフセット
-	uint8_t bitmap[MAX_GLYPH_HEIGHT]; // ビットマップデータ
+	uint16_t bitmap[MAX_GLYPH_HEIGHT]; // ビットマップデータ
 } bdf_glyph_t;
 
 /**
@@ -31,24 +31,8 @@ typedef struct {
 	bdf_glyph_t glyphs[MAX_GLYPHS]; // グリフ配列
 } bdf_font_t;
 
-/**
- * @brief BDFフォントを初期化
- * @param path フォントファイルのパス
- * @return 成功時は1、失敗時は0
- */
 int bdf_init(const char *path);
-
-/**
- * @brief 文字コードに対応するグリフを取得
- * @param c 文字コード
- * @return グリフへのポインタ、見つからない場合はNULL
- */
 const bdf_glyph_t *bdf_get_glyph(uint32_t c);
-
-/**
- * @brief フォント情報を取得
- * @return フォント情報へのポインタ
- */
 const bdf_font_t *bdf_get_font(void);
 
 #endif /* _BDF_H */