Changeset 323 for trunk/hal/x86_64

Timestamp:

Aug 6, 2017, 8:33:00 AM (7 years ago)

Author:

max@…

Message:

Clean up, and define strstr() in libk.

File:

• trunk/hal/x86_64/core/hal_init.c (modified) (6 diffs)

trunk/hal/x86_64/core/hal_init.c

@@ -82 +82 @@
 /* -------------------------------------------------------------------------- */
 
-/* XXX XXX XXX libk */
-char *
-strstr(char *s, const char *find)
-{
-        char c, sc;
-        size_t len;
-
-        if ((c = *find++) != 0) {
-                len = strlen(find);
-                do {
-                        do {
-                                if ((sc = *s++) == 0)
-                                        return (NULL);
-                        } while (sc != c);
-                } while (strncmp(s, find, len) != 0);
-                s--;
-        }
-        return s;
-}
-
-static void
-dump_memmap()
+/*
+ * Configure the features of the system depending on the multiboot info.
+ */
+static void multiboot_init()
 {
         size_t mmap_length = mb_info.mi_mmap_length;
@@ -398 +380 @@
         x86_printf("[+] bootloader: '%s'\n", mb_loader_name);
 
-        dump_memmap();
-        x86_printf("[+] dump finished\n");
+        multiboot_init();
+        x86_printf("[+] multiboot_init called\n");
 
         hal_gpt_init(firstpa);
@@ -473 +455 @@
 }
 
-static void
-setregion(struct region_descriptor *rd, void *base, uint16_t limit)
+static void setregion(struct region_descriptor *rd, void *base, uint16_t limit)
 {
         rd->rd_limit = limit;
@@ -482 +463 @@
 /* -------------------------------------------------------------------------- */
 
-static void
-gdt_set_memseg(struct gdt_memseg *sd, void *base, size_t limit,
+static void gdt_set_memseg(struct gdt_memseg *sd, void *base, size_t limit,
         int type, int dpl, int gran, bool_t is64)
 {
@@ -499 +479 @@
 }
 
-static void
-gdt_set_sysseg(struct gdt_sysseg *sd, void *base, size_t limit,
+static void gdt_set_sysseg(struct gdt_sysseg *sd, void *base, size_t limit,
         int type, int dpl, int gran)
 {
@@ -565 +544 @@
 }
 
-static void
-idt_set_seg(struct idt_seg *seg, void *func, int ist, int type, int dpl, int sel)
+static void idt_set_seg(struct idt_seg *seg, void *func, int ist, int type,
+    int dpl, int sel)
 {
         seg->gd_looffset = (uint64_t)func & 0xffff;