Ignore:
Timestamp:
2011-04-13T14:45:41Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
88634420
Parents:
cefb126 (diff), 17279ead (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
  • kernel/arch/arm32/include/mach/gta02/gta02.h

    rcefb126 r89c57b6  
    11/*
    2  * Copyright (c) 2005 Sergey Bondari
     2 * Copyright (c) 2010 Jiri Svoboda
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup arm32
     29/** @addtogroup arm32gta02 GTA02
     30 *  @brief Openmoko GTA02 platform.
     31 *  @ingroup arm32
    3032 * @{
    3133 */
    3234/** @file
    33  *  @brief Memory manipulating functions declarations.
     35 *  @brief Openmoko GTA02 platform driver.
    3436 */
    3537
    36 #ifndef KERN_arm32_MEMSTR_H_
    37 #define KERN_arm32_MEMSTR_H_
     38#ifndef KERN_arm32_gta02_H_
     39#define KERN_arm32_gta02_H_
    3840
    39 #define memcpy(dst, src, cnt)  __builtin_memcpy((dst), (src), (cnt))
     41#include <arch/machine_func.h>
    4042
    41 extern void memsetw(void *, size_t, uint16_t);
    42 extern void memsetb(void *, size_t, uint8_t);
     43extern struct arm_machine_ops gta02_machine_ops;
     44
     45/** Size of GTA02 IRQ number range (starting from 0) */
     46#define GTA02_IRQ_COUNT 32
    4347
    4448#endif
Note: See TracChangeset for help on using the changeset viewer.