Changeset 192 for trunk

Timestamp:

Jul 13, 2017, 9:27:38 AM (7 years ago)

Author:

max@…

Message:

initialize pic

File:

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

trunk/hal/x86_64/core/hal_init.c

@@ -86 +86 @@
 /* -------------------------------------------------------------------------- */
 
-static void init_bootinfo_icu(boot_device_t *dev)
-{
-        extern uint32_t hwi_baseidx;
-        extern uint32_t wti_baseidx;
-        extern uint32_t pti_baseidx;
-        extern size_t ioapic_pins;
-
-        memset(dev, 0, sizeof(boot_device_t));
-
-        dev->base = 0;
-        dev->type = (DEV_FUNC_ICU << 16) | IMPL_ICU_XCU;
-        dev->channels = 1;
-
-#if NOTYET
-        /*
-         * Give 20% of the pins to HWI, 80% to WTI.
-         */
-        dev->param0 = (ioapic_pins * 20) / 100;  /* hwi_nr */
-        dev->param1 = ioapic_pins - dev->param0; /* wti_nr */
-#else
-        dev->param0 = 1; /* hwi_nr */
-        dev->param1 = 1; /* wti_nr */
-#endif
-
-        /*
-         * We always set 1 for pti_nr. On x86, timer interrupts are handled by
-         * LAPIC, which is per-cpu and not global. Therefore, we always have one
-         * timer for each CPU, and its IRQ number is faked to 0.
-         */
-        dev->param2 = 1; /* pti_nr */
-
-        dev->param3 = 0;
-
-        /* Set the base idx for the XCU driver */
-        hwi_baseidx = 0;
-        wti_baseidx = dev->param0;
-        pti_baseidx = 0xFFFFFFFF;
-
-#ifdef NOTYET
-    uint32_t    irqs;                 /*! number of input IRQs                              */
-    boot_irq_t  irq[32];              /*! array of input IRQS (PIC and ICU only)            */
-#endif
-}
-
 static size_t init_bootinfo_pages_nr()
 {
@@ -195 +151 @@
 }
 
-static void init_bootinfo_txt(boot_device_t *dev)
+static void init_bootinfo_pic(boot_device_t *dev)
 {
         memset(dev, 0, sizeof(boot_device_t));
 
-        dev->base = 0xB8000;
-        dev->type = (DEV_FUNC_TXT << 16) | IMPL_TXT_X86;
+        dev->base = 0;
+        dev->type = (DEV_FUNC_PIC << 16) | IMPL_PIC_SCL;
         dev->channels = 1;
         dev->param0 = 0;
@@ -207 +163 @@
         dev->param3 = 0;
 
-#ifdef NOTYET
-    uint32_t    irqs;    /*! number of input IRQs                    */
-    boot_irq_t  irq[32]; /*! array of input IRQS (PIC and ICU only)  */
-#endif
+        dev->irqs = 5;
+
+        /* COM1 */
+        dev->irq[4].dev_type = (DEV_FUNC_TXT << 16) | IMPL_TXT_TTY;
+        dev->irq[4].channel = 0;
+        dev->irq[4].is_rx = 0;
+        dev->irq[4].valid = 1;
+}
+
+static void init_bootinfo_txt(boot_device_t *dev)
+{
+        memset(dev, 0, sizeof(boot_device_t));
+
+        dev->base = 0;
+        dev->type = (DEV_FUNC_TXT << 16) | IMPL_TXT_TTY;
+        dev->channels = 1;
+        dev->param0 = 0;
+        dev->param1 = 0;
+        dev->param2 = 0;
+        dev->param3 = 0;
 }
 
@@ -231 +203 @@
         info->io_cxy = 0;
 
-        info->ext_dev_nr = 1;
+        info->ext_dev_nr = 2;
         init_bootinfo_txt(&info->ext_dev[0]);
+        init_bootinfo_pic(&info->ext_dev[1]);
 
         info->cxy = 0;
@@ -240 +213 @@
         info->rsvd_nr = init_bootinfo_rsvd((boot_rsvd_t *)&info->rsvd);
 
-        init_bootinfo_icu(&info->dev_icu);
+        /* TODO: dev_icu */
         /* TODO: dev_mmc */
         /* TODO: dev_dma */
@@ -308 +281 @@
         hal_enable_irq(&dummy);
 
-        while (1);
-
         kernel_init(&btinfo);
 
         x86_printf("[+] kernel_init called\n");
-
+/*
+        void *ptr;
+
+        khm_t *khm = &LOCAL_CLUSTER->khm;
+        ptr = khm_alloc(khm, 10);
+        memset(ptr, 0, 10);
+        khm_free(ptr);
+
+
+        kcm_t *kcm = &LOCAL_CLUSTER->kcm;
+        ptr = kcm_alloc(kcm);
+        memset(ptr, 0, 1);
+        kcm_free(ptr);
+
+        ptr = ppm_alloc_pages(1);
+        ppm_free_pages(ptr);
+*/
         while (1);