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

Timestamp:

2010-05-21T07:50:04Z (16 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

d51ee2b

Parents:

cf8cc36 (diff), 15b592b (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 (rev. 451)

File:

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

boot/arch/arm32/src/putchar.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2006 Martin Decky
+ * Copyright (c) 2007 Michal Kebrt
+ * Copyright (c) 2009 Vineeth Pillai
  * All rights reserved.
  *
@@ -27 +28 @@
  */
 
-
 /** @addtogroup arm32boot
  * @{
  */
-/** @file 
- *  @brief Definitions of basic types like #uintptr_t.
- */ 
+/** @file
+ * @brief bootloader output logic
+ */
 
+#include <typedefs.h>
+#include <arch/main.h>
+#include <putchar.h>
+#include <str.h>
 
-#ifndef BOOT_arm32_TYPES_H
-#define BOOT_arm32_TYPES_H
-
-
-#include <gentypes.h>
-
-typedef signed char int8_t;
-
-typedef unsigned char uint8_t;
-typedef unsigned short uint16_t;
-typedef unsigned int uint32_t;
-typedef unsigned long long uint64_t;
-
-typedef uint32_t uintptr_t;
-typedef uint32_t unative_t;
-
-
-#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;
+}
 
 /** @}