Changeset 25a76ab8 in mainline for boot/arch/arm32/src/putchar.c

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• boot/arch/arm32/src/putchar.c (moved) (moved from boot/generic/string.h ) (2 diffs)

boot/arch/arm32/src/putchar.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2007 Michal Kebrt
+ * Copyright (c) 2009 Vineeth Pillai
  * All rights reserved.
  *
@@ -27 +28 @@
  */
 
-/** @addtogroup generic 
+/** @addtogroup arm32boot
  * @{
  */
 /** @file
+ * @brief bootloader output logic
  */
 
-#ifndef BOOT_STRING_H_
-#define BOOT_STRING_H_
+#include <typedefs.h>
+#include <arch/main.h>
+#include <putchar.h>
+#include <str.h>
 
-#include <types.h>
-
-extern size_t strlen(const char *str);
-extern int strcmp(const char *src, const char *dst);
-extern int strncmp(const char *src, const char *dst, size_t len);
-extern void strncpy(char *dest, const char *src, size_t len);
-extern unative_t atoi(const char *text);
-extern void *memmove(void *dst, const void *src, size_t len);
-
-#endif
+void putchar(const wchar_t ch)
+{
+        if (ch == '\n')
+                *((volatile char *) VIDEORAM_ADDRESS) = '\r';
+        
+        if (ascii_check(ch))
+                *((volatile char *) VIDEORAM_ADDRESS) = ch;
+        else
+                *((volatile char *) VIDEORAM_ADDRESS) = U_SPECIAL;
+}
 
 /** @}