376253ece4
Refactor the monitor API and prepare it for decoupled terminals: term_print functions are renamed to monitor_* and all monitor services gain a new parameter (mon) that will once refer to the monitor instance the output is supposed to appear on. However, the argument remains unused for now. All monitor command callbacks are also extended by a mon parameter so that command handlers are able to pass an appropriate reference to monitor output services. For the case that monitor outputs so far happen without clearly identifiable context, the global variable cur_mon is introduced that shall once provide a pointer either to the current active monitor (while processing commands) or to the default one. On the mid or long term, those use case will be obsoleted so that this variable can be removed again. Due to the broad usage of the monitor interface, this patch mostly deals with converting users of the monitor API. A few of them are already extended to pass 'mon' from the command handler further down to internal functions that invoke monitor_printf. At this chance, monitor-related prototypes are moved from console.h to a new monitor.h. The same is done for the readline API. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6711 c046a42c-6fe2-441c-8c8c-71466251a162
97 lines
3.0 KiB
C
97 lines
3.0 KiB
C
/*
|
|
* SHIX 2.0 board description
|
|
*
|
|
* Copyright (c) 2005 Samuel Tardieu
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
/*
|
|
Shix 2.0 board by Alexis Polti, described at
|
|
http://perso.enst.fr/~polti/realisations/shix20/
|
|
|
|
More information in target-sh4/README.sh4
|
|
*/
|
|
#include "hw.h"
|
|
#include "pc.h"
|
|
#include "sh.h"
|
|
#include "sysemu.h"
|
|
#include "boards.h"
|
|
|
|
#define BIOS_FILENAME "shix_bios.bin"
|
|
#define BIOS_ADDRESS 0xA0000000
|
|
|
|
void irq_info(Monitor *mon)
|
|
{
|
|
/* XXXXX */
|
|
}
|
|
|
|
void pic_info(Monitor *mon)
|
|
{
|
|
/* XXXXX */
|
|
}
|
|
|
|
static void shix_init(ram_addr_t ram_size, int vga_ram_size,
|
|
const char *boot_device,
|
|
const char *kernel_filename, const char *kernel_cmdline,
|
|
const char *initrd_filename, const char *cpu_model)
|
|
{
|
|
int ret;
|
|
CPUState *env;
|
|
struct SH7750State *s;
|
|
|
|
if (!cpu_model)
|
|
cpu_model = "any";
|
|
|
|
printf("Initializing CPU\n");
|
|
env = cpu_init(cpu_model);
|
|
|
|
/* Allocate memory space */
|
|
printf("Allocating ROM\n");
|
|
cpu_register_physical_memory(0x00000000, 0x00004000, IO_MEM_ROM);
|
|
printf("Allocating SDRAM 1\n");
|
|
cpu_register_physical_memory(0x08000000, 0x01000000, 0x00004000);
|
|
printf("Allocating SDRAM 2\n");
|
|
cpu_register_physical_memory(0x0c000000, 0x01000000, 0x01004000);
|
|
|
|
/* Load BIOS in 0 (and access it through P2, 0xA0000000) */
|
|
if (bios_name == NULL)
|
|
bios_name = BIOS_FILENAME;
|
|
printf("%s: load BIOS '%s'\n", __func__, bios_name);
|
|
ret = load_image(bios_name, phys_ram_base);
|
|
if (ret < 0) { /* Check bios size */
|
|
fprintf(stderr, "ret=%d\n", ret);
|
|
fprintf(stderr, "qemu: could not load SHIX bios '%s'\n",
|
|
bios_name);
|
|
exit(1);
|
|
}
|
|
|
|
/* Register peripherals */
|
|
s = sh7750_init(env);
|
|
/* XXXXX Check success */
|
|
tc58128_init(s, "shix_linux_nand.bin", NULL);
|
|
fprintf(stderr, "initialization terminated\n");
|
|
}
|
|
|
|
QEMUMachine shix_machine = {
|
|
.name = "shix",
|
|
.desc = "shix card",
|
|
.init = shix_init,
|
|
.ram_require = (0x00004000 + 0x01000000 + 0x01000000) | RAMSIZE_FIXED,
|
|
};
|