From 70eb9f9cd1c0b519b31df8ab08ee2198b0e16176 Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Thu, 3 Sep 2020 18:40:18 +0800 Subject: hw/riscv: Move riscv_htif model to hw/char This is an effort to clean up the hw/riscv directory. Ideally it should only contain the RISC-V SoC / machine codes plus generic codes. Let's move riscv_htif model to hw/char directory. Signed-off-by: Bin Meng Reviewed-by: Alistair Francis Message-Id: <1599129623-68957-8-git-send-email-bmeng.cn@gmail.com> Signed-off-by: Alistair Francis --- include/hw/riscv/riscv_htif.h | 59 ------------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 include/hw/riscv/riscv_htif.h (limited to 'include/hw/riscv') diff --git a/include/hw/riscv/riscv_htif.h b/include/hw/riscv/riscv_htif.h deleted file mode 100644 index fb9452cf51..0000000000 --- a/include/hw/riscv/riscv_htif.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * QEMU RISCV Host Target Interface (HTIF) Emulation - * - * Copyright (c) 2016-2017 Sagar Karandikar, sagark@eecs.berkeley.edu - * Copyright (c) 2017-2018 SiFive, Inc. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2 or later, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see . - */ - -#ifndef HW_RISCV_HTIF_H -#define HW_RISCV_HTIF_H - -#include "chardev/char.h" -#include "chardev/char-fe.h" -#include "exec/memory.h" -#include "target/riscv/cpu.h" - -#define TYPE_HTIF_UART "riscv.htif.uart" - -typedef struct HTIFState { - int allow_tohost; - int fromhost_inprogress; - - hwaddr tohost_offset; - hwaddr fromhost_offset; - uint64_t tohost_size; - uint64_t fromhost_size; - MemoryRegion mmio; - MemoryRegion *address_space; - MemoryRegion *main_mem; - void *main_mem_ram_ptr; - - CPURISCVState *env; - CharBackend chr; - uint64_t pending_read; -} HTIFState; - -extern const VMStateDescription vmstate_htif; -extern const MemoryRegionOps htif_io_ops; - -/* HTIF symbol callback */ -void htif_symbol_callback(const char *st_name, int st_info, uint64_t st_value, - uint64_t st_size); - -/* legacy pre qom */ -HTIFState *htif_mm_init(MemoryRegion *address_space, MemoryRegion *main_mem, - CPURISCVState *env, Chardev *chr); - -#endif -- cgit v1.2.3-55-g7522