diff options
| -rw-r--r-- | kernel/drivers/gpu.c | 2 | ||||
| -rw-r--r-- | kernel/drivers/gpu/bochs.c | 4 | ||||
| -rw-r--r-- | kernel/drivers/gpu/gop.c | 4 | ||||
| -rw-r--r-- | kernel/include/comus/drivers/gpu.h | 4 | ||||
| -rw-r--r-- | kernel/include/comus/drivers/gpu/bochs.h | 2 | ||||
| -rw-r--r-- | kernel/include/comus/drivers/gpu/gop.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/kernel/drivers/gpu.c b/kernel/drivers/gpu.c index 3d79b99..fc6ec8e 100644 --- a/kernel/drivers/gpu.c +++ b/kernel/drivers/gpu.c @@ -7,7 +7,7 @@ #include <comus/term.h> #include <comus/asm.h> -struct gpu *gpu_dev = NULL; +struct gpu_dev *gpu_dev = NULL; int gpu_init(void) { diff --git a/kernel/drivers/gpu/bochs.c b/kernel/drivers/gpu/bochs.c index f8e5820..2dfe62e 100644 --- a/kernel/drivers/gpu/bochs.c +++ b/kernel/drivers/gpu/bochs.c @@ -31,7 +31,7 @@ #define BOCHS_HEIGHT 768 #define BOCHS_BIT_DEPTH 32 -struct gpu bochs_dev = { 0 }; +struct gpu_dev bochs_dev = { 0 }; static void write(uint16_t index, uint16_t data) { @@ -45,7 +45,7 @@ static uint16_t read(uint16_t value) return inw(DATA); } -int bochs_init(struct gpu **gpu_dev) +int bochs_init(struct gpu_dev **gpu_dev) { struct pci_device bochs = { 0 }; bool found = diff --git a/kernel/drivers/gpu/gop.c b/kernel/drivers/gpu/gop.c index 47da952..a57766d 100644 --- a/kernel/drivers/gpu/gop.c +++ b/kernel/drivers/gpu/gop.c @@ -5,11 +5,11 @@ #include <comus/efi.h> #include <efi.h> -struct gpu gop_dev = { 0 }; +struct gpu_dev gop_dev = { 0 }; static EFI_GRAPHICS_OUTPUT_PROTOCOL *gop; -int gop_init(struct gpu **gpu_dev) +int gop_init(struct gpu_dev **gpu_dev) { gop = efi_get_gop(); if (gop == NULL || gop->Mode == NULL) diff --git a/kernel/include/comus/drivers/gpu.h b/kernel/include/comus/drivers/gpu.h index 39c633f..0a8f4fa 100644 --- a/kernel/include/comus/drivers/gpu.h +++ b/kernel/include/comus/drivers/gpu.h @@ -11,7 +11,7 @@ #include <stdint.h> -struct gpu { +struct gpu_dev { const char *name; uint16_t width; uint16_t height; @@ -31,7 +31,7 @@ struct psf2_font { uint8_t data[]; }; -extern struct gpu *gpu_dev; +extern struct gpu_dev *gpu_dev; extern struct psf2_font en_font; /** diff --git a/kernel/include/comus/drivers/gpu/bochs.h b/kernel/include/comus/drivers/gpu/bochs.h index 7d26b60..ec70060 100644 --- a/kernel/include/comus/drivers/gpu/bochs.h +++ b/kernel/include/comus/drivers/gpu/bochs.h @@ -15,6 +15,6 @@ * Loads the bochs graphics driver * @returns 0 on success, NULL on error */ -int bochs_init(struct gpu **gpu_dev); +int bochs_init(struct gpu_dev **gpu_dev); #endif /* bochs.h */ diff --git a/kernel/include/comus/drivers/gpu/gop.h b/kernel/include/comus/drivers/gpu/gop.h index 6475f05..d3af921 100644 --- a/kernel/include/comus/drivers/gpu/gop.h +++ b/kernel/include/comus/drivers/gpu/gop.h @@ -15,6 +15,6 @@ * Loads the uefi gop graphics driver * @returns 0 on success, NULL on error */ -int gop_init(struct gpu **gpu_dev); +int gop_init(struct gpu_dev **gpu_dev); #endif /* gop.h */ |