Changeset 195

Timestamp:

Jul 13, 2017, 12:28:37 PM (7 years ago)

Author:

max@…

Message:

add IOC (ATA)

Location:

trunk/hal/x86_64/core

Files:

• hal_context.c (modified) (1 diff)
• hal_cpu.S (modified) (1 diff)
• hal_init.c (modified) (2 diffs)
• hal_internal.h (modified) (1 diff)

trunk/hal/x86_64/core/hal_context.c

@@ -52 +52 @@
 
         /* set cpu context pointer in thread */
-        thread->cpu_context = (void*)context;
+        thread->cpu_context = (void *)context;
 
         /* build the context */

trunk/hal/x86_64/core/hal_cpu.S

@@ -70 +70 @@
         ret
 
+ASM_ENTRY(in16)
+        movq    %rdi,%rdx
+        xorq    %rax,%rax
+        inw     %dx,%ax
+        ret
+
 ASM_ENTRY(out8)
         movq    %rdi,%rdx
         movq    %rsi,%rax
         outb    %al,%dx
+        ret
+
+ASM_ENTRY(out16)
+        movq    %rdi,%rdx
+        movq    %rsi,%rax
+        outw    %ax,%dx
         ret
 

trunk/hal/x86_64/core/hal_init.c

@@ -151 +151 @@
 }
 
+static void init_bootinfo_ioc(boot_device_t *dev)
+{
+        memset(dev, 0, sizeof(boot_device_t));
+
+        dev->base = 0;
+        dev->type = (DEV_FUNC_IOC << 16) | IMPL_IOC_BDV;
+        dev->channels = 1;
+}
+
 static void init_bootinfo_pic(boot_device_t *dev)
 {
@@ -203 +212 @@
         info->io_cxy = 0;
 
-        info->ext_dev_nr = 2;
+        info->ext_dev_nr = 3;
         init_bootinfo_txt(&info->ext_dev[0]);
         init_bootinfo_pic(&info->ext_dev[1]);
+        init_bootinfo_ioc(&info->ext_dev[2]);
 
         info->cxy = 0;

trunk/hal/x86_64/core/hal_internal.h

@@ -37 +37 @@
 uint64_t rdtsc();
 uint8_t in8(uint32_t port);
+uint16_t in16(uint32_t port);
 void out8(uint32_t port, uint8_t val);
+void out16(uint32_t port, uint16_t val);
 uint64_t rdmsr(uint32_t);
 void wrmsr(uint32_t, uint64_t);