Evaluated license issues, made some other enhancements.

src/glue/arm/init.c

@@ -181,12 +181,12 @@ void kip_init()
 	kip.api_version 	= 0xBB;
 	kip.api_subversion 	= 1;
 	kip.api_flags 		= 0; 		/* LE, 32-bit architecture */
-	kip.kdesc.subid		= 0x1;
-	kip.kdesc.id 		= 0xBB;
-	kip.kdesc.gendate 	= (__YEAR__ << 9)|(__MONTH__ << 5)|(__DAY__);
-	kip.kdesc.subsubver 	= 0x00000001; /* Consider as .00000001 */
-	kip.kdesc.ver 		= 0;
-	memcpy(&kip.kdesc.supplier, "BBB", 3);
+	kip.kdesc.magic		= 0xBBB;
+	kip.kdesc.version	= CODEZERO_VERSION;
+	kip.kdesc.subversion	= CODEZERO_SUBVERSION;
+	// kip.kdesc.gendate 	= (__YEAR__ << 9)|(__MONTH__ << 5)|(__DAY__);
+	strncpy(kip.kdesc.date, __DATE__, KDESC_DATE_SIZE);
+	strncpy(kip.kdesc.time, __TIME__, KDESC_TIME_SIZE);
 
 	kip_init_syscalls();
 
@@ -198,6 +198,8 @@ void kip_init()
 
 	add_mapping(virt_to_phys(&kip), USER_KIP_PAGE, PAGE_SIZE,
 		    MAP_USR_RO_FLAGS);
+	printk("%s: Kernel built on %s, %s\n", __KERNELNAME__,
+	       kip.kdesc.date, kip.kdesc.time);
 }
 
 

src/lib/string.c

@@ -41,29 +41,27 @@ int strcmp(const char *s1, const char *s2)
 	}
 }
 
-/* LICENCE: Taken from linux for now BB.
- * strncpy - Copy a length-limited, %NUL-terminated string
- * @dest: Where to copy the string to
- * @src: Where to copy the string from
- * @count: The maximum number of bytes to copy
- *
- * The result is not %NUL-terminated if the source exceeds
- * @count bytes.
- *
- * In the case where the length of @src is less than  that  of
- * count, the remainder of @dest will be padded with %NUL.
+/*
+ * Copies string pointed by @from to string pointed by @to.
  *
+ * If count is greater than the length of string in @from,
+ * pads rest of the locations with null.
  */
-char *strncpy(char *dest, const char *src, int count)
+char *strncpy(char *to, const char *from, int count)
 {
-	char *tmp = dest;
- 
+	char *temp = to;
+
 	while (count) {
-		if ((*tmp = *src) != 0)
-			src++;
-		tmp++;
+		*temp = *from;
+
+		/*
+		 * Stop updating from if null
+		 * terminator is reached.
+		 */
+		if (*from)
+			from++;
+		temp++;
 		count--;
 	}
-	return dest;
+	return to;
 }
-

src/platform/pb926/printascii.S

@@ -1,7 +1,41 @@
-
-#include INC_PLAT(debug-macro.S)
+/*
+ * Basic UART printing.
+ */
 #include INC_ARCH(asm.h)
 #include INC_GLUE(memlayout.h)
+
+#define UART_DATA_OFFSET		0x0
+
+	.macro uart_address rx
+	mrc	p15, 0, \rx, c1, c0
+	tst	\rx, #1		@ MMU enabled?
+	moveq	\rx, #0x10000000
+	orreq	\rx, \rx, #0x001F0000
+	orreq	\rx, \rx, #0x00001000
+	/* FIXME: This offset is incorrect */
+	movne	\rx,      #0xf9000000 @#IO_AREA0_VADDR
+	addne	\rx, \rx, #PB926_UART0_VOFFSET	@ UART0 page offset from
+						@ virtual io area base.
+	.endm
+
+	.macro uart_send, ry, rx
+	strb	\ry, [\rx, #UART_DATA_OFFSET]
+	.endm
+
+	.macro uart_wait, ry, rx
+501:
+	ldr	\ry, [\rx, #0x18]
+	tst	\ry, #1 << 5
+	bne	501b
+	.endm
+
+	.macro uart_busy, ry, rx
+501:
+	ldr	\ry, [\rx, #0x18]
+	tst	\ry, #1 << 3
+	bne	501b
+	.endm
+
 		.text
 /*
  * Useful debugging routines
@@ -49,11 +83,11 @@ printhex:	adr	r2, hexbuf
 
 BEGIN_PROC(printascii)
 		get_straddr r0, r1
-		addruart r3
+		uart_address r3
 		b	2f
-1:		waituart r2, r3
-		senduart r1, r3
-		busyuart r2, r3
+1:		uart_wait r2, r3
+		uart_send r1, r3
+		uart_busy r2, r3
 		teq	r1, #'\n'
 		moveq	r1, #'\r'
 		beq	1b
@@ -65,7 +99,7 @@ BEGIN_PROC(printascii)
 END_PROC(printascii)
 
 BEGIN_PROC(printch)
-		addruart r3
+		uart_address r3
 		mov	r1, r0
 		mov	r0, #0
 		b	1b