m-labs · Feb 7, 2012
diff --git a/‎software/bios/Makefile
+2-1 b/‎software/bios/Makefile
+2-1
diff --git a/‎software/bios/main.c
+444-9 b/‎software/bios/main.c
+444-9
diff --git a/‎software/include/base/console.h
-1 b/‎software/include/base/console.h
-1
diff --git a/‎software/include/base/stdio.h
+3 b/‎software/include/base/stdio.h
+3
diff --git a/‎software/libbase/console.c
+5-20 b/‎software/libbase/console.c
+5-20
diff --git a/‎software/libextra/Makefile
+18 b/‎software/libextra/Makefile
+18
diff --git a/‎software/libextra/crc16.c
+1-1 b/‎software/libextra/crc16.c
+1-1
diff --git a/‎software/libextra/crc32.c
+1-1 b/‎software/libextra/crc32.c
+1-1
@@ -18,11 +18,12 @@ bios.elf: linker.ld $(OBJECTS) libs
 bios-rescue.elf: linker-rescue.ld $(OBJECTS) libs
 
 %.elf:
-	$(LD) $(LDFLAGS) -T $< -N -o $@ $(OBJECTS) -L$(M2DIR)/software/libbase -lbase
+	$(LD) $(LDFLAGS) -T $< -N -o $@ $(OBJECTS) -L$(M2DIR)/software/libbase -L$(M2DIR)/software/libextra -lbase -lextra
 	chmod -x $@
 
 libs:
 	make -C $(M2DIR)/software/libbase
+	make -C $(M2DIR)/software/libextra
 
 .PHONY: clean libs
 
 
@@ -28,7 +28,6 @@ void console_set_read_hook(console_read_hook r, console_read_nonblock_hook rn);
 char readchar(void);
 int readchar_nonblock(void);
 
-int puts(const char *s);
 void putsnonl(const char *s);
 
 #endif /* __CONSOLE_H */
@@ -20,6 +20,9 @@
 
 #include <stdlib.h>
 
+int putchar(int c);
+int puts(const char *s);
+
 int snprintf(char *buf, size_t size, const char *fmt, ...);
 int scnprintf(char *buf, size_t size, const char *fmt, ...);
 int sprintf(char *buf, const char *fmt, ...);
 
@@ -19,8 +19,6 @@
 #include <console.h>
 #include <stdio.h>
 #include <stdarg.h>
-#include <irq.h>
-#include <hw/interrupts.h>
 
 static console_write_hook write_hook;
 static console_read_hook read_hook;
@@ -37,11 +35,12 @@ void console_set_read_hook(console_read_hook r, console_read_nonblock_hook rn)
 	read_nonblock_hook = rn;
 }
 
-static void writechar(char c)
+int putchar(int c)
 {
 	uart_write(c);
 	if(write_hook != NULL)
 		write_hook(c);
+	return c;
 }
 
 char readchar(void)
@@ -62,34 +61,20 @@ int readchar_nonblock(void)
 
 int puts(const char *s)
 {
-	unsigned int oldmask;
-
-	oldmask = irq_getmask();
-	irq_setmask(IRQ_UART); // HACK: prevent UART data loss
-
 	while(*s) {
-		writechar(*s);
+		putchar(*s);
 		s++;
 	}
-	writechar('\n');
-	
-	irq_setmask(oldmask);
+	putchar('\n');
 	return 1;
 }
 
 void putsnonl(const char *s)
 {
-	unsigned int oldmask;
-
-	oldmask = irq_getmask();
-	irq_setmask(IRQ_UART); // HACK: prevent UART data loss
-	
 	while(*s) {
-		writechar(*s);
+		putchar(*s);
 		s++;
 	}
-	
-	irq_setmask(oldmask);
 }
 
 int printf(const char *fmt, ...)
 
@@ -0,0 +1,18 @@
+M2DIR=../..
+include $(M2DIR)/software/include.mak
+
+OBJECTS=crc16.o crc32.o
+
+all: libextra.a
+
+# pull in dependency info for *existing* .o files
+-include $(OBJECTS:.o=.d)
+
+libextra.a: $(OBJECTS)
+	$(AR) clr libextra.a $(OBJECTS)
+	$(RANLIB) libextra.a
+
+.PHONY: clean
+
+clean:
+	rm -f $(OBJECTS) $(OBJECTS:.o=.d) libextra.a .*~ *~
@@ -1,4 +1,4 @@
-#include <crc.h>
+#include <extra/crc.h>
 
 static const unsigned int crc16_table[256] = {
 	0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
 
@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-#include <crc.h>
+#include <extra/crc.h>
 
 static const unsigned int crc_table[256] = {
 	0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include <crc.h>`
	`1`	`+#include <extra/crc.h>`
`2`	`2`
`3`	`3`	`static const unsigned int crc16_table[256] = {`
`4`	`4`	`0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,`