From 97b932f08b65546e4986b246058d161975eae05d Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Wed, 17 Jun 2020 15:53:45 -0700 Subject: [PATCH] dsp: Split DSPState structure off into new file --- hw/xbox/dsp/dsp.c | 9 +-------- hw/xbox/dsp/dsp_state.h | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 hw/xbox/dsp/dsp_state.h diff --git a/hw/xbox/dsp/dsp.c b/hw/xbox/dsp/dsp.c index ce576ecd78..999ab80efd 100644 --- a/hw/xbox/dsp/dsp.c +++ b/hw/xbox/dsp/dsp.c @@ -32,6 +32,7 @@ #include "dsp_cpu.h" #include "dsp_dma.h" +#include "dsp_state.h" #include "dsp.h" @@ -45,14 +46,6 @@ #define DPRINTF(s, ...) printf(s, ## __VA_ARGS__) -struct DSPState { - dsp_core_t core; - DSPDMAState dma; - int save_cycles; - - uint32_t interrupts; -}; - static uint32_t read_peripheral(dsp_core_t* core, uint32_t address); static void write_peripheral(dsp_core_t* core, uint32_t address, uint32_t value); diff --git a/hw/xbox/dsp/dsp_state.h b/hw/xbox/dsp/dsp_state.h new file mode 100644 index 0000000000..a578094e36 --- /dev/null +++ b/hw/xbox/dsp/dsp_state.h @@ -0,0 +1,39 @@ +/* + * MCPX DSP emulator + + * Copyright (c) 2015 espes + + * Adapted from Hatari DSP M56001 emulation + * (C) 2001-2008 ARAnyM developer team + * Adaption to Hatari (C) 2008 by Thomas Huth + + * 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. + + * This program is distributed in the hope that 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, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef DSP_STATE_H +#define DSP_STATE_H + +#include "dsp_cpu.h" +#include "dsp_dma.h" + +struct DSPState { + dsp_core_t core; + DSPDMAState dma; + int save_cycles; + + uint32_t interrupts; +}; + +#endif /* DSP_STATE_H */