diff options
author | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-04-14 21:05:22 +0000 |
---|---|---|
committer | balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162> | 2008-04-14 21:05:22 +0000 |
commit | 827df9f3c5fdea53531acf02b2db0afb9858f053 (patch) | |
tree | 95cb9c8d0ab76f1155f25df9cda123ce97cb0643 /hw/palm.c | |
parent | f93eb9ff66868df42f8433d16f2dc48a4af2490f (diff) | |
download | qemu-827df9f3c5fdea53531acf02b2db0afb9858f053.zip qemu-827df9f3c5fdea53531acf02b2db0afb9858f053.tar.gz qemu-827df9f3c5fdea53531acf02b2db0afb9858f053.tar.bz2 |
Add basic OMAP2 chip support.
Add the OMAP242x (arm1136 core) initialisation with basic on-chip
peripherals and update OMAP1 peripherals which are re-used in OMAP2.
Make palmte.c and sd.c errors go to stderr.
Allow disabling SD chipselect.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4213 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/palm.c')
-rw-r--r-- | hw/palm.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -5,8 +5,8 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. + * published by the Free Software Foundation; either version 2 or + * (at your option) version 3 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -25,6 +25,7 @@ #include "omap.h" #include "boards.h" #include "arm-misc.h" +#include "devices.h" static uint32_t static_readb(void *opaque, target_phys_addr_t offset) { @@ -32,12 +33,14 @@ static uint32_t static_readb(void *opaque, target_phys_addr_t offset) return *val >> ((offset & 3) << 3); } -static uint32_t static_readh(void *opaque, target_phys_addr_t offset) { +static uint32_t static_readh(void *opaque, target_phys_addr_t offset) +{ uint32_t *val = (uint32_t *) opaque; return *val >> ((offset & 1) << 3); } -static uint32_t static_readw(void *opaque, target_phys_addr_t offset) { +static uint32_t static_readw(void *opaque, target_phys_addr_t offset) +{ uint32_t *val = (uint32_t *) opaque; return *val >> ((offset & 0) << 3); } |