Changeset 573Tweet

Timestamp:

Mar 9, 2006, 4:35:00 PM (17 years ago)

Author:

Sam Hocevar

Message:

• Added assembly code for inb() and outb().
• Print a small message at kernel boot time just to check that the kernel was properly loaded.

Location:

libcaca/trunk

Files:

• build-kernel (modified) (3 diffs)
• caca/caca_internals.h (modified) (1 diff)
• cucul/cucul_internals.h (modified) (1 diff)
• kernel/kernel.c (modified) (1 diff)
• kernel/kernel.h (modified) (1 diff)

libcaca/trunk/build-kernel

@@ -2 +2 @@
 
 ##  Kernel-mode libcaca compilation script -- Sam Hocevar <sam@zoy.org>
-##  $Id: build-dos 333 2006-03-07 12:39:34Z sam $
+##  $Id$
 
 set -x
@@ -16 +16 @@
             --host i386
 
-(cd cucul && make)
-(cd caca && make)
+# We need this.
+make clean
 
-(cd src && make cacafire-aafire.o)
+cd cucul && make && cd ..
+cd caca && make && cd ..
 
-(cd kernel &&
-    gcc $CFLAGS -c multiboot.S -o multiboot.o
-    gcc $CFLAGS $CPPFLAGS -c kernel.c -o kernel.o)
+cd src && make cacafire-aafire.o && cd ..
+
+cd kernel &&
+    gcc $CFLAGS -c multiboot.S -o multiboot.o &&
+    gcc $CFLAGS $CPPFLAGS -c kernel.c -o kernel.o &&
+cd ..
 
 gcc $LDFLAGS -o src/cacafire kernel/multiboot.o kernel/kernel.o src/cacafire-aafire.o caca/.libs/libcaca.a cucul/.libs/libcucul.a
@@ -29 +33 @@
 objcopy -O binary src/cacafire cacafire.boot
 
+# For further development: create floppy images using the kernel
+#gcc -traditional -c -o bootsect.o bootsect.S
+#ld -Ttext 0x0 -s --oformat binary bootsect.o -o cacafire.img
+

libcaca/trunk/caca/caca_internals.h

@@ -27 +27 @@
 typedef unsigned char uint8_t;
 typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
+typedef unsigned long int uint32_t;
+typedef long int intptr_t;
+typedef long unsigned int uintptr_t;
 #endif
 

libcaca/trunk/cucul/cucul_internals.h

@@ -27 +27 @@
 typedef unsigned char uint8_t;
 typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
+typedef unsigned long int uint32_t;
+typedef long int intptr_t;
+typedef long unsigned int uintptr_t;
 #endif
 

libcaca/trunk/kernel/kernel.c

@@ -30 +30 @@
 void cmain(unsigned long int magic, unsigned long int addr)
 {
+    static char const text[] = "Booting libcaca kernel...";
+    char const *ptr = text;
+    char *video = (char*)0xB8000;
+
     char *argv[] = { NULL };
     int argc = 0;
+
+    /* Print a text message to say hello */
+    while(*ptr)
+        *video = *ptr++; video += 2;
+
+    /* Launch the main program */
     main(argc, argv);
 }

libcaca/trunk/kernel/kernel.h

@@ -28 +28 @@
 #define __BIG_ENDIAN 2
 
+/* Assembly code for outb and inb */
+extern inline void outb(unsigned char val, unsigned short port);
+extern inline unsigned char inb(unsigned short port);
+
+extern inline void outb(unsigned char val, unsigned short port)
+{
+    __asm__ __volatile__ ("outb %b0,%w1" : : "a" (val), "Nd" (port));
+}
+
+extern inline unsigned char inb(unsigned short port)
+{
+    unsigned char tmp;
+    __asm__ __volatile__ ("inb %w1,%0" : "=a" (tmp) : "Nd" (port));
+    return tmp;
+}
+
 /* Various typedefs -- some are x86-specific */
 #define CUSTOM_INTTYPES
 typedef unsigned char uint8_t;
 typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned int uintptr_t;
+typedef unsigned long int uint32_t;
+typedef long int intptr_t;
+typedef long unsigned int uintptr_t;
 
 typedef unsigned int size_t;