Fork us on GitHub Follow us on Facebook Follow us on Twitter

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


Ignore:
Timestamp:
2010-05-08T07:53:23Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
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:
1 moved

Legend:

Unmodified
Added
Removed
  • boot/arch/arm32/src/putchar.c

    r6c39a907 r25a76ab8  
    11/*
    2  * Copyright (c) 2006 Martin Decky
     2 * Copyright (c) 2007 Michal Kebrt
     3 * Copyright (c) 2009 Vineeth Pillai
    34 * All rights reserved.
    45 *
     
    2728 */
    2829
    29 
    3030/** @addtogroup arm32boot
    3131 * @{
    3232 */
    33 /** @file 
    34  *  @brief Definitions of basic types like #uintptr_t.
    35  */ 
     33/** @file
     34 * @brief bootloader output logic
     35 */
    3636
     37#include <typedefs.h>
     38#include <arch/main.h>
     39#include <putchar.h>
     40#include <str.h>
    3741
    38 #ifndef BOOT_arm32_TYPES_H
    39 #define BOOT_arm32_TYPES_H
    40 
    41 
    42 #include <gentypes.h>
    43 
    44 typedef signed char int8_t;
    45 
    46 typedef unsigned char uint8_t;
    47 typedef unsigned short uint16_t;
    48 typedef unsigned int uint32_t;
    49 typedef unsigned long long uint64_t;
    50 
    51 typedef uint32_t uintptr_t;
    52 typedef uint32_t unative_t;
    53 
    54 
    55 #endif
    56 
     42void putchar(const wchar_t ch)
     43{
     44        if (ch == '\n')
     45                *((volatile char *) VIDEORAM_ADDRESS) = '\r';
     46       
     47        if (ascii_check(ch))
     48                *((volatile char *) VIDEORAM_ADDRESS) = ch;
     49        else
     50                *((volatile char *) VIDEORAM_ADDRESS) = U_SPECIAL;
     51}
    5752
    5853/** @}
Note: See TracChangeset for help on using the changeset viewer.