diff --git a/src/gopheros/device/video/console/device.go b/src/gopheros/device/video/console/device.go index 7b98274..b90b0bd 100644 --- a/src/gopheros/device/video/console/device.go +++ b/src/gopheros/device/video/console/device.go @@ -4,8 +4,8 @@ import ( "gopheros/device/video/console/font" "gopheros/device/video/console/logo" "gopheros/kernel/cpu" - "gopheros/kernel/hal/multiboot" "gopheros/kernel/mem/vmm" + "gopheros/multiboot" "image/color" ) diff --git a/src/gopheros/device/video/console/vesa_fb.go b/src/gopheros/device/video/console/vesa_fb.go index 57f71d6..413815e 100644 --- a/src/gopheros/device/video/console/vesa_fb.go +++ b/src/gopheros/device/video/console/vesa_fb.go @@ -5,11 +5,11 @@ import ( "gopheros/device/video/console/font" "gopheros/device/video/console/logo" "gopheros/kernel" - "gopheros/kernel/hal/multiboot" "gopheros/kernel/kfmt" "gopheros/kernel/mem" "gopheros/kernel/mem/pmm" "gopheros/kernel/mem/vmm" + "gopheros/multiboot" "image/color" "io" "reflect" diff --git a/src/gopheros/device/video/console/vesa_fb_test.go b/src/gopheros/device/video/console/vesa_fb_test.go index c956026..dccea3c 100644 --- a/src/gopheros/device/video/console/vesa_fb_test.go +++ b/src/gopheros/device/video/console/vesa_fb_test.go @@ -8,10 +8,10 @@ import ( "gopheros/device/video/console/logo" "gopheros/kernel" "gopheros/kernel/cpu" - "gopheros/kernel/hal/multiboot" "gopheros/kernel/mem" "gopheros/kernel/mem/pmm" "gopheros/kernel/mem/vmm" + "gopheros/multiboot" "image/color" "reflect" "strings" diff --git a/src/gopheros/device/video/console/vga_text.go b/src/gopheros/device/video/console/vga_text.go index 908657a..f9569aa 100644 --- a/src/gopheros/device/video/console/vga_text.go +++ b/src/gopheros/device/video/console/vga_text.go @@ -3,11 +3,11 @@ package console import ( "gopheros/device" "gopheros/kernel" - "gopheros/kernel/hal/multiboot" "gopheros/kernel/kfmt" "gopheros/kernel/mem" "gopheros/kernel/mem/pmm" "gopheros/kernel/mem/vmm" + "gopheros/multiboot" "image/color" "io" "reflect" diff --git a/src/gopheros/device/video/console/vga_text_test.go b/src/gopheros/device/video/console/vga_text_test.go index eda3c92..28c144d 100644 --- a/src/gopheros/device/video/console/vga_text_test.go +++ b/src/gopheros/device/video/console/vga_text_test.go @@ -4,10 +4,10 @@ import ( "gopheros/device" "gopheros/kernel" "gopheros/kernel/cpu" - "gopheros/kernel/hal/multiboot" "gopheros/kernel/mem" "gopheros/kernel/mem/pmm" "gopheros/kernel/mem/vmm" + "gopheros/multiboot" "image/color" "testing" "unsafe" diff --git a/src/gopheros/kernel/hal/hal.go b/src/gopheros/kernel/hal/hal.go index 02cbce9..fc0e856 100644 --- a/src/gopheros/kernel/hal/hal.go +++ b/src/gopheros/kernel/hal/hal.go @@ -7,8 +7,8 @@ import ( "gopheros/device/video/console" "gopheros/device/video/console/font" "gopheros/device/video/console/logo" - "gopheros/kernel/hal/multiboot" "gopheros/kernel/kfmt" + "gopheros/multiboot" "sort" // import and register acpi driver diff --git a/src/gopheros/kernel/hal/multiboot/multiboot.go b/src/gopheros/multiboot/multiboot.go similarity index 100% rename from src/gopheros/kernel/hal/multiboot/multiboot.go rename to src/gopheros/multiboot/multiboot.go diff --git a/src/gopheros/kernel/hal/multiboot/multiboot_test.go b/src/gopheros/multiboot/multiboot_test.go similarity index 100% rename from src/gopheros/kernel/hal/multiboot/multiboot_test.go rename to src/gopheros/multiboot/multiboot_test.go