Cosmetic, and add missing files to the CMakeLists.

This commit is contained in:
Godzil 2022-06-27 22:33:36 +01:00
parent e48f7a76a7
commit 330cba592d
10 changed files with 15 additions and 17 deletions

View File

@ -1,14 +1,16 @@
set(SOURCES emulate.c gpu.c io.c log.c memory.c rom.c ws.c file_access.c)
set(PERIPHERAL_SOURCES peripherals/audio.c peripherals/buttons.c peripherals/color_gpu.c peripherals/color_system.c
peripherals/debug.c peripherals/dma.c peripherals/eeprom.c peripherals/mono_gpu.c peripherals/mono_system.c
peripherals/rtc.c peripherals/universal_luxor.c)
peripherals/rtc.c peripherals/universal_luxor.c peripherals/interrupt_controller.c peripherals/rs232.c
peripherals/timer.c)
set(PERIPHERAL_HEADERS includes/interrupt_controller.h)
set(HEADERS includes/audio.h includes/device.h includes/emulate.h includes/gpu.h includes/io.h includes/log.h
includes/memory.h includes/nec.h includes/nec_debugger.h includes/necintrf.h includes/rom.h includes/ws.h
includes/file_access.h)
option(FAKE_DISPLAY "Disable OpenGL and fake displaying" OFF)
add_library(wswan ${SOURCES} ${PERIPHERAL_SOURCES} ${HEADERS})
add_library(wswan ${SOURCES} ${PERIPHERAL_SOURCES} ${HEADERS} ${PERIPHERAL_HEADERS})
if (FAKE_DISPLAY)
target_compile_options(wswan PRIVATE -DPRETENT_DISPLAY)

View File

@ -2,7 +2,7 @@
* NewOswan
* file_access.c: File manipulation functions
*
* Based on the original Oswan-unix
* Created by Manoël Trapier on 27/06/2022.
* Copyright (c) 2014-2022 986-Studio. All rights reserved.
*
* This file is OS specific and this need to be changed at some point.

View File

@ -17,7 +17,7 @@
* Each device which need to be clocked use a multiple of the tick
* number as their own clock.
*/
typedef uint64_t tick_t
typedef uint64_t tick_t;
typedef void (*device_init)(uint8_t baseAddress, void *param);
typedef void (*device_reset)(void);

View File

@ -1,8 +1,8 @@
/*******************************************************************************
* NewOswan
* memory.h:
* file_access.h:
*
* Based on the original Oswan-unix
* Created by Manoël Trapier on 26/06/2022.
* Copyright (c) 2014-2022 986-Studio. All rights reserved.
*
******************************************************************************/

View File

@ -2,7 +2,7 @@
* NewOswan
* interrupt_controller.h:
*
* Created by mlt on 14/03/2022.
* Created by Manoël Trapier on 14/03/2022.
* Copyright (c) 2022 986-Studio. All rights reserved.
*
******************************************************************************/

View File

@ -2,7 +2,7 @@
* NewOswan
* memory.h:
*
* Based on the original Oswan-unix
*
* Copyright (c) 2014-2022 986-Studio. All rights reserved.
*
******************************************************************************/
@ -28,11 +28,6 @@ void set_memory_bank(uint8_t bank, uint8_t *pointer);
*/
void set_memory_page(uint8_t page, uint8_t *pointer);
void set_irom_overlay();
uint8_t *getRom(uint32_t *size);
uint8_t *getSram(uint32_t *size);
#define mem_readop mem_readmem20
#define mem_readop_arg mem_readmem20
void mem_writemem20(uint32_t addr, uint8_t value);

View File

@ -1,6 +1,7 @@
/*******************************************************************************
* NewOswan
* audio.c:
*
* Based on the original Oswan-unix
* Copyright (c) 2014-2022 986-Studio. All rights reserved.
*

View File

@ -1,4 +1,4 @@
/*
/*******************************************************************************
* NewOswan
* buttons.c:
*

View File

@ -2,7 +2,7 @@
* NewOswan
* interrupt_controller.c:
*
* Created by mlt on 14/03/2022.
* Created by Manoël Trapier on 14/03/2022.
* Copyright (c) 2022 986-Studio. All rights reserved.
*
******************************************************************************/

View File

@ -1,8 +1,8 @@
/*
/*******************************************************************************
* NewOswan
* timer.c:
*
* Created by Manoël Trapier on 26/06/2022.
* Copyright (c) 2014-2022 986-Studio. All rights reserved.
*
*/
******************************************************************************/