From 55adab93f7f2631b821e98826ef28796eb4524ad Mon Sep 17 00:00:00 2001 From: Ivan Roberto de Oliveira Date: Thu, 28 Feb 2019 11:45:09 -0300 Subject: [PATCH] Name change (again) --- CMakeLists.txt | 4 +- Doxyfile | 2 +- README.md | 26 +++---- apps/cli/CMakeLists.txt | 16 ++--- apps/cli/src/main.cpp | 14 ++-- apps/cli/src/pch.hpp | 2 +- modules/core/CMakeLists.txt | 32 ++++----- .../core/include/{vixen => strikebox}/alloc.h | 2 +- modules/core/include/strikebox/core.h | 14 ++++ .../include/{vixen => strikebox}/cxbxtimer.h | 2 +- .../core/include/{vixen => strikebox}/debug.h | 4 +- .../{vixen => strikebox}/dynamic_variant.h | 2 +- .../include/{vixen => strikebox}/gdbserver.h | 2 +- .../include/{vixen => strikebox}/hw/ata/ata.h | 4 +- .../{vixen => strikebox}/hw/ata/ata_channel.h | 4 +- .../{vixen => strikebox}/hw/ata/ata_common.h | 2 +- .../{vixen => strikebox}/hw/ata/ata_defs.h | 2 +- .../{vixen => strikebox}/hw/ata/ata_device.h | 2 +- .../hw/ata/cmds/ata_command.h | 4 +- .../hw/ata/cmds/cmd_identify_device.h | 2 +- .../hw/ata/cmds/cmd_identify_packet_device.h | 2 +- .../hw/ata/cmds/cmd_init_dev_params.h | 2 +- .../hw/ata/cmds/cmd_packet.h | 2 +- .../hw/ata/cmds/cmd_read_dma.h | 2 +- .../hw/ata/cmds/cmd_security_unlock.h | 2 +- .../hw/ata/cmds/cmd_set_features.h | 2 +- .../hw/ata/cmds/cmd_write_dma.h | 2 +- .../hw/ata/cmds/proto_dma.h | 2 +- .../hw/ata/cmds/proto_nondata.h | 2 +- .../hw/ata/cmds/proto_packet.h | 12 ++-- .../hw/ata/cmds/proto_pio_data_in.h | 2 +- .../hw/ata/cmds/proto_pio_data_out.h | 2 +- .../hw/ata/drvs/ata_device_driver.h | 2 +- .../hw/ata/drvs/drv_null.h | 2 +- .../hw/ata/drvs/drv_vdvd_base.h | 2 +- .../hw/ata/drvs/drv_vdvd_dummy.h | 2 +- .../hw/ata/drvs/drv_vdvd_image.h | 2 +- .../hw/ata/drvs/drv_vhd_base.h | 2 +- .../hw/ata/drvs/drv_vhd_dummy.h | 2 +- .../hw/ata/drvs/drv_vhd_image.h | 2 +- .../{vixen => strikebox}/hw/ata/drvs/util.h | 2 +- .../hw/atapi/atapi_common.h | 2 +- .../hw/atapi/atapi_defs.h | 2 +- .../hw/atapi/atapi_utils.h | 2 +- .../hw/atapi/atapi_xbox.h | 2 +- .../hw/atapi/cmds/atapi_command.h | 4 +- .../hw/atapi/cmds/cmd_mode_sense_10.h | 2 +- .../hw/atapi/cmds/cmd_read_10.h | 2 +- .../hw/atapi/cmds/cmd_read_capacity.h | 2 +- .../hw/atapi/cmds/cmd_read_dvd_structure.h | 2 +- .../hw/atapi/cmds/cmd_test_unit_ready.h | 2 +- .../hw/atapi/cmds/proto_data_in.h | 2 +- .../hw/atapi/cmds/proto_nondata.h | 2 +- .../{vixen => strikebox}/hw/basic/char.h | 4 +- .../{vixen => strikebox}/hw/basic/char_null.h | 2 +- .../{vixen => strikebox}/hw/basic/cmos.h | 4 +- .../{vixen => strikebox}/hw/basic/gsi.h | 2 +- .../{vixen => strikebox}/hw/basic/i8254.h | 4 +- .../{vixen => strikebox}/hw/basic/i8259.h | 4 +- .../{vixen => strikebox}/hw/basic/interrupt.h | 2 +- .../{vixen => strikebox}/hw/basic/ioapic.h | 2 +- .../{vixen => strikebox}/hw/basic/irq.h | 2 +- .../{vixen => strikebox}/hw/basic/mcpx.h | 2 +- .../{vixen => strikebox}/hw/basic/serial.h | 8 +-- .../{vixen => strikebox}/hw/basic/superio.h | 2 +- .../{vixen => strikebox}/hw/bus/isabus.h | 2 +- .../{vixen => strikebox}/hw/bus/pcibus.h | 4 +- .../{vixen => strikebox}/hw/bus/smbus.h | 2 +- .../include/{vixen => strikebox}/hw/defs.h | 2 +- .../{vixen => strikebox}/hw/nv2a/defs.h | 2 +- .../{vixen => strikebox}/hw/nv2a/nv2a_int.h | 0 .../{vixen => strikebox}/hw/nv2a/vga.h | 0 .../{vixen => strikebox}/hw/ohci/ohci.h | 4 +- .../hw/ohci/ohci_common.h | 8 +-- .../{vixen => strikebox}/hw/ohci/ohci_hub.h | 2 +- .../{vixen => strikebox}/hw/pci/ac97.h | 2 +- .../{vixen => strikebox}/hw/pci/agpbridge.h | 2 +- .../{vixen => strikebox}/hw/pci/bmide.h | 4 +- .../hw/pci/bmide_channel.h | 8 +-- .../{vixen => strikebox}/hw/pci/bmide_defs.h | 2 +- .../{vixen => strikebox}/hw/pci/hostbridge.h | 2 +- .../include/{vixen => strikebox}/hw/pci/lpc.h | 2 +- .../{vixen => strikebox}/hw/pci/mcpx_ram.h | 2 +- .../{vixen => strikebox}/hw/pci/nv2a.h | 2 +- .../{vixen => strikebox}/hw/pci/nvapu.h | 2 +- .../{vixen => strikebox}/hw/pci/nvnet.h | 2 +- .../include/{vixen => strikebox}/hw/pci/pci.h | 2 +- .../{vixen => strikebox}/hw/pci/pci_common.h | 2 +- .../{vixen => strikebox}/hw/pci/pci_irq.h | 2 +- .../{vixen => strikebox}/hw/pci/pci_regs.h | 0 .../{vixen => strikebox}/hw/pci/pcibridge.h | 2 +- .../{vixen => strikebox}/hw/pci/usb_pci.h | 2 +- .../{vixen => strikebox}/hw/sm/adm1032.h | 2 +- .../{vixen => strikebox}/hw/sm/eeprom.h | 2 +- .../include/{vixen => strikebox}/hw/sm/led.h | 2 +- .../include/{vixen => strikebox}/hw/sm/sm.h | 2 +- .../include/{vixen => strikebox}/hw/sm/smc.h | 2 +- .../{vixen => strikebox}/hw/sm/tvenc.h | 2 +- .../hw/sm/tvenc_conexant.h | 2 +- .../include/{vixen => strikebox}/hw/utils.h | 2 +- .../{vixen => strikebox}/hw/xid/xid_gamepad.h | 2 +- .../core/include/{vixen => strikebox}/io.h | 2 +- .../core/include/{vixen => strikebox}/iovec.h | 2 +- .../core/include/{vixen => strikebox}/log.h | 2 +- .../core/include/{vixen => strikebox}/mem.h | 2 +- .../core/include/{vixen => strikebox}/queue.h | 0 .../include/{vixen => strikebox}/settings.h | 6 +- .../include/{vixen => strikebox}/status.h | 2 +- .../include/{vixen => strikebox}/thread.h | 2 +- .../core/include/{vixen => strikebox}/timer.h | 2 +- .../core/include/{vixen => strikebox}/util.h | 2 +- .../include/{vixen => strikebox}/util/fifo.h | 4 +- .../{vixen => strikebox}/util/invoke_later.h | 2 +- .../core/include/{vixen => strikebox}/xbox.h | 70 +++++++++---------- modules/core/include/vixen/core.h | 14 ---- modules/core/src/common/pch.hpp | 6 +- .../src/common/{vixen => strikebox}/core.cpp | 10 +-- .../common/{vixen => strikebox}/cxbxtimer.cpp | 4 +- .../src/common/{vixen => strikebox}/debug.cpp | 4 +- .../common/{vixen => strikebox}/gdbserver.cpp | 4 +- .../{vixen => strikebox}/hw/ata/ata.cpp | 8 +-- .../hw/ata/ata_channel.cpp | 8 +-- .../hw/ata/ata_common.cpp | 4 +- .../hw/ata/ata_device.cpp | 8 +-- .../hw/ata/cmds/ata_command.cpp | 6 +- .../hw/ata/cmds/cmd_identify_device.cpp | 6 +- .../ata/cmds/cmd_identify_packet_device.cpp | 6 +- .../hw/ata/cmds/cmd_init_dev_params.cpp | 6 +- .../hw/ata/cmds/cmd_packet.cpp | 6 +- .../hw/ata/cmds/cmd_read_dma.cpp | 6 +- .../hw/ata/cmds/cmd_security_unlock.cpp | 6 +- .../hw/ata/cmds/cmd_set_features.cpp | 6 +- .../hw/ata/cmds/cmd_write_dma.cpp | 6 +- .../hw/ata/cmds/proto_dma.cpp | 6 +- .../hw/ata/cmds/proto_nondata.cpp | 6 +- .../hw/ata/cmds/proto_packet.cpp | 16 ++--- .../hw/ata/cmds/proto_pio_data_in.cpp | 6 +- .../hw/ata/cmds/proto_pio_data_out.cpp | 6 +- .../hw/ata/drvs/ata_device_driver.cpp | 8 +-- .../hw/ata/drvs/drv_null.cpp | 8 +-- .../hw/ata/drvs/drv_vdvd_base.cpp | 8 +-- .../hw/ata/drvs/drv_vdvd_dummy.cpp | 8 +-- .../hw/ata/drvs/drv_vdvd_image.cpp | 14 ++-- .../hw/ata/drvs/drv_vhd_base.cpp | 8 +-- .../hw/ata/drvs/drv_vhd_dummy.cpp | 8 +-- .../hw/ata/drvs/drv_vhd_image.cpp | 8 +-- .../{vixen => strikebox}/hw/ata/drvs/util.cpp | 4 +- .../hw/atapi/atapi_common.cpp | 4 +- .../hw/atapi/cmds/atapi_command.cpp | 6 +- .../hw/atapi/cmds/cmd_mode_sense_10.cpp | 6 +- .../hw/atapi/cmds/cmd_read_10.cpp | 6 +- .../hw/atapi/cmds/cmd_read_capacity.cpp | 6 +- .../hw/atapi/cmds/cmd_read_dvd_structure.cpp | 6 +- .../hw/atapi/cmds/cmd_test_unit_ready.cpp | 6 +- .../hw/atapi/cmds/proto_data_in.cpp | 6 +- .../hw/atapi/cmds/proto_nondata.cpp | 6 +- .../src/common/strikebox/hw/basic/char.cpp | 7 ++ .../hw/basic/char_null.cpp | 4 +- .../{vixen => strikebox}/hw/basic/cmos.cpp | 8 +-- .../{vixen => strikebox}/hw/basic/gsi.cpp | 4 +- .../{vixen => strikebox}/hw/basic/i8254.cpp | 6 +- .../{vixen => strikebox}/hw/basic/i8259.cpp | 8 +-- .../{vixen => strikebox}/hw/basic/irq.cpp | 4 +- .../{vixen => strikebox}/hw/basic/mcpx.cpp | 6 +- .../{vixen => strikebox}/hw/basic/serial.cpp | 8 +-- .../{vixen => strikebox}/hw/basic/superio.cpp | 8 +-- .../{vixen => strikebox}/hw/bus/isabus.cpp | 6 +- .../{vixen => strikebox}/hw/bus/pcibus.cpp | 6 +- .../{vixen => strikebox}/hw/bus/smbus.cpp | 6 +- .../{vixen => strikebox}/hw/ohci/ohci.cpp | 8 +-- .../{vixen => strikebox}/hw/ohci/ohci_hub.cpp | 8 +-- .../{vixen => strikebox}/hw/pci/ac97.cpp | 6 +- .../{vixen => strikebox}/hw/pci/agpbridge.cpp | 6 +- .../{vixen => strikebox}/hw/pci/bmide.cpp | 8 +-- .../hw/pci/bmide_channel.cpp | 8 +-- .../hw/pci/hostbridge.cpp | 6 +- .../{vixen => strikebox}/hw/pci/lpc.cpp | 8 +-- .../{vixen => strikebox}/hw/pci/mcpx_ram.cpp | 6 +- .../{vixen => strikebox}/hw/pci/nv2a.cpp | 8 +-- .../{vixen => strikebox}/hw/pci/nvapu.cpp | 6 +- .../{vixen => strikebox}/hw/pci/nvnet.cpp | 6 +- .../{vixen => strikebox}/hw/pci/pci.cpp | 8 +-- .../{vixen => strikebox}/hw/pci/pci_irq.cpp | 4 +- .../{vixen => strikebox}/hw/pci/pcibridge.cpp | 8 +-- .../{vixen => strikebox}/hw/pci/usb_pci.cpp | 8 +-- .../{vixen => strikebox}/hw/sm/adm1032.cpp | 4 +- .../{vixen => strikebox}/hw/sm/eeprom.cpp | 4 +- .../core/src/common/strikebox/hw/sm/sm.cpp | 7 ++ .../common/{vixen => strikebox}/hw/sm/smc.cpp | 8 +-- .../{vixen => strikebox}/hw/sm/tvenc.cpp | 4 +- .../hw/sm/tvenc_conexant.cpp | 4 +- .../hw/xid/xid_gamepad.cpp | 8 +-- .../src/common/{vixen => strikebox}/io.cpp | 6 +- .../src/common/{vixen => strikebox}/iovec.cpp | 4 +- .../src/common/{vixen => strikebox}/log.cpp | 4 +- .../src/common/{vixen => strikebox}/timer.cpp | 4 +- .../core/src/common/strikebox/util/fifo.cpp | 7 ++ .../util/invoke_later.cpp | 4 +- .../src/common/{vixen => strikebox}/xbox.cpp | 32 ++++----- .../core/src/common/vixen/hw/basic/char.cpp | 7 -- modules/core/src/common/vixen/hw/sm/sm.cpp | 7 -- modules/core/src/common/vixen/util/fifo.cpp | 7 -- modules/core/src/linux/thread.cpp | 8 +-- .../hw/basic/win32/char_serial.cpp | 6 +- .../hw/basic/win32/char_serial.h | 6 +- .../hw/basic/win32/mt_serial.cpp | 8 +-- .../hw/basic/win32/mt_serial.h | 2 +- modules/core/src/windows/thread.cpp | 8 +-- 208 files changed, 534 insertions(+), 548 deletions(-) rename modules/core/include/{vixen => strikebox}/alloc.h (88%) create mode 100644 modules/core/include/strikebox/core.h rename modules/core/include/{vixen => strikebox}/cxbxtimer.h (99%) rename modules/core/include/{vixen => strikebox}/debug.h (91%) rename modules/core/include/{vixen => strikebox}/dynamic_variant.h (98%) rename modules/core/include/{vixen => strikebox}/gdbserver.h (99%) rename modules/core/include/{vixen => strikebox}/hw/ata/ata.h (95%) rename modules/core/include/{vixen => strikebox}/hw/ata/ata_channel.h (98%) rename modules/core/include/{vixen => strikebox}/hw/ata/ata_common.h (98%) rename modules/core/include/{vixen => strikebox}/hw/ata/ata_defs.h (99%) rename modules/core/include/{vixen => strikebox}/hw/ata/ata_device.h (98%) rename modules/core/include/{vixen => strikebox}/hw/ata/cmds/ata_command.h (97%) rename modules/core/include/{vixen => strikebox}/hw/ata/cmds/cmd_identify_device.h (97%) rename modules/core/include/{vixen => strikebox}/hw/ata/cmds/cmd_identify_packet_device.h (98%) rename modules/core/include/{vixen => strikebox}/hw/ata/cmds/cmd_init_dev_params.h (97%) rename modules/core/include/{vixen => strikebox}/hw/ata/cmds/cmd_packet.h (97%) rename modules/core/include/{vixen => strikebox}/hw/ata/cmds/cmd_read_dma.h (97%) rename modules/core/include/{vixen => strikebox}/hw/ata/cmds/cmd_security_unlock.h (97%) rename modules/core/include/{vixen => strikebox}/hw/ata/cmds/cmd_set_features.h (98%) rename modules/core/include/{vixen => strikebox}/hw/ata/cmds/cmd_write_dma.h (97%) rename modules/core/include/{vixen => strikebox}/hw/ata/cmds/proto_dma.h (98%) rename modules/core/include/{vixen => strikebox}/hw/ata/cmds/proto_nondata.h (98%) rename modules/core/include/{vixen => strikebox}/hw/ata/cmds/proto_packet.h (89%) rename modules/core/include/{vixen => strikebox}/hw/ata/cmds/proto_pio_data_in.h (98%) rename modules/core/include/{vixen => strikebox}/hw/ata/cmds/proto_pio_data_out.h (98%) rename modules/core/include/{vixen => strikebox}/hw/ata/drvs/ata_device_driver.h (99%) rename modules/core/include/{vixen => strikebox}/hw/ata/drvs/drv_null.h (99%) rename modules/core/include/{vixen => strikebox}/hw/ata/drvs/drv_vdvd_base.h (99%) rename modules/core/include/{vixen => strikebox}/hw/ata/drvs/drv_vdvd_dummy.h (98%) rename modules/core/include/{vixen => strikebox}/hw/ata/drvs/drv_vdvd_image.h (98%) rename modules/core/include/{vixen => strikebox}/hw/ata/drvs/drv_vhd_base.h (99%) rename modules/core/include/{vixen => strikebox}/hw/ata/drvs/drv_vhd_dummy.h (98%) rename modules/core/include/{vixen => strikebox}/hw/ata/drvs/drv_vhd_image.h (98%) rename modules/core/include/{vixen => strikebox}/hw/ata/drvs/util.h (86%) rename modules/core/include/{vixen => strikebox}/hw/atapi/atapi_common.h (99%) rename modules/core/include/{vixen => strikebox}/hw/atapi/atapi_defs.h (99%) rename modules/core/include/{vixen => strikebox}/hw/atapi/atapi_utils.h (99%) rename modules/core/include/{vixen => strikebox}/hw/atapi/atapi_xbox.h (97%) rename modules/core/include/{vixen => strikebox}/hw/atapi/cmds/atapi_command.h (97%) rename modules/core/include/{vixen => strikebox}/hw/atapi/cmds/cmd_mode_sense_10.h (98%) rename modules/core/include/{vixen => strikebox}/hw/atapi/cmds/cmd_read_10.h (98%) rename modules/core/include/{vixen => strikebox}/hw/atapi/cmds/cmd_read_capacity.h (98%) rename modules/core/include/{vixen => strikebox}/hw/atapi/cmds/cmd_read_dvd_structure.h (98%) rename modules/core/include/{vixen => strikebox}/hw/atapi/cmds/cmd_test_unit_ready.h (98%) rename modules/core/include/{vixen => strikebox}/hw/atapi/cmds/proto_data_in.h (99%) rename modules/core/include/{vixen => strikebox}/hw/atapi/cmds/proto_nondata.h (98%) rename modules/core/include/{vixen => strikebox}/hw/basic/char.h (97%) rename modules/core/include/{vixen => strikebox}/hw/basic/char_null.h (94%) rename modules/core/include/{vixen => strikebox}/hw/basic/cmos.h (97%) rename modules/core/include/{vixen => strikebox}/hw/basic/gsi.h (94%) rename modules/core/include/{vixen => strikebox}/hw/basic/i8254.h (94%) rename modules/core/include/{vixen => strikebox}/hw/basic/i8259.h (97%) rename modules/core/include/{vixen => strikebox}/hw/basic/interrupt.h (90%) rename modules/core/include/{vixen => strikebox}/hw/basic/ioapic.h (67%) rename modules/core/include/{vixen => strikebox}/hw/basic/irq.h (94%) rename modules/core/include/{vixen => strikebox}/hw/basic/mcpx.h (93%) rename modules/core/include/{vixen => strikebox}/hw/basic/serial.h (95%) rename modules/core/include/{vixen => strikebox}/hw/basic/superio.h (98%) rename modules/core/include/{vixen => strikebox}/hw/bus/isabus.h (89%) rename modules/core/include/{vixen => strikebox}/hw/bus/pcibus.h (96%) rename modules/core/include/{vixen => strikebox}/hw/bus/smbus.h (98%) rename modules/core/include/{vixen => strikebox}/hw/defs.h (97%) rename modules/core/include/{vixen => strikebox}/hw/nv2a/defs.h (99%) rename modules/core/include/{vixen => strikebox}/hw/nv2a/nv2a_int.h (100%) rename modules/core/include/{vixen => strikebox}/hw/nv2a/vga.h (100%) rename modules/core/include/{vixen => strikebox}/hw/ohci/ohci.h (99%) rename modules/core/include/{vixen => strikebox}/hw/ohci/ohci_common.h (99%) rename modules/core/include/{vixen => strikebox}/hw/ohci/ohci_hub.h (99%) rename modules/core/include/{vixen => strikebox}/hw/pci/ac97.h (96%) rename modules/core/include/{vixen => strikebox}/hw/pci/agpbridge.h (92%) rename modules/core/include/{vixen => strikebox}/hw/pci/bmide.h (94%) rename modules/core/include/{vixen => strikebox}/hw/pci/bmide_channel.h (94%) rename modules/core/include/{vixen => strikebox}/hw/pci/bmide_defs.h (99%) rename modules/core/include/{vixen => strikebox}/hw/pci/hostbridge.h (95%) rename modules/core/include/{vixen => strikebox}/hw/pci/lpc.h (98%) rename modules/core/include/{vixen => strikebox}/hw/pci/mcpx_ram.h (94%) rename modules/core/include/{vixen => strikebox}/hw/pci/nv2a.h (99%) rename modules/core/include/{vixen => strikebox}/hw/pci/nvapu.h (99%) rename modules/core/include/{vixen => strikebox}/hw/pci/nvnet.h (96%) rename modules/core/include/{vixen => strikebox}/hw/pci/pci.h (99%) rename modules/core/include/{vixen => strikebox}/hw/pci/pci_common.h (94%) rename modules/core/include/{vixen => strikebox}/hw/pci/pci_irq.h (95%) rename modules/core/include/{vixen => strikebox}/hw/pci/pci_regs.h (100%) rename modules/core/include/{vixen => strikebox}/hw/pci/pcibridge.h (96%) rename modules/core/include/{vixen => strikebox}/hw/pci/usb_pci.h (99%) rename modules/core/include/{vixen => strikebox}/hw/sm/adm1032.h (97%) rename modules/core/include/{vixen => strikebox}/hw/sm/eeprom.h (97%) rename modules/core/include/{vixen => strikebox}/hw/sm/led.h (97%) rename modules/core/include/{vixen => strikebox}/hw/sm/sm.h (96%) rename modules/core/include/{vixen => strikebox}/hw/sm/smc.h (99%) rename modules/core/include/{vixen => strikebox}/hw/sm/tvenc.h (94%) rename modules/core/include/{vixen => strikebox}/hw/sm/tvenc_conexant.h (96%) rename modules/core/include/{vixen => strikebox}/hw/utils.h (97%) rename modules/core/include/{vixen => strikebox}/hw/xid/xid_gamepad.h (99%) rename modules/core/include/{vixen => strikebox}/io.h (99%) rename modules/core/include/{vixen => strikebox}/iovec.h (99%) rename modules/core/include/{vixen => strikebox}/log.h (97%) rename modules/core/include/{vixen => strikebox}/mem.h (97%) rename modules/core/include/{vixen => strikebox}/queue.h (100%) rename modules/core/include/{vixen => strikebox}/settings.h (97%) rename modules/core/include/{vixen => strikebox}/status.h (98%) rename modules/core/include/{vixen => strikebox}/thread.h (84%) rename modules/core/include/{vixen => strikebox}/timer.h (94%) rename modules/core/include/{vixen => strikebox}/util.h (98%) rename modules/core/include/{vixen => strikebox}/util/fifo.h (96%) rename modules/core/include/{vixen => strikebox}/util/invoke_later.h (98%) rename modules/core/include/{vixen => strikebox}/xbox.h (77%) delete mode 100644 modules/core/include/vixen/core.h rename modules/core/src/common/{vixen => strikebox}/core.cpp (77%) rename modules/core/src/common/{vixen => strikebox}/cxbxtimer.cpp (98%) rename modules/core/src/common/{vixen => strikebox}/debug.cpp (99%) rename modules/core/src/common/{vixen => strikebox}/gdbserver.cpp (99%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/ata.cpp (96%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/ata_channel.cpp (98%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/ata_common.cpp (93%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/ata_device.cpp (87%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/cmds/ata_command.cpp (89%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/cmds/cmd_identify_device.cpp (95%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/cmds/cmd_identify_packet_device.cpp (94%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/cmds/cmd_init_dev_params.cpp (96%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/cmds/cmd_packet.cpp (87%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/cmds/cmd_read_dma.cpp (86%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/cmds/cmd_security_unlock.cpp (91%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/cmds/cmd_set_features.cpp (98%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/cmds/cmd_write_dma.cpp (86%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/cmds/proto_dma.cpp (98%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/cmds/proto_nondata.cpp (92%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/cmds/proto_packet.cpp (97%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/cmds/proto_pio_data_in.cpp (96%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/cmds/proto_pio_data_out.cpp (96%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/drvs/ata_device_driver.cpp (86%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/drvs/drv_null.cpp (86%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/drvs/drv_vdvd_base.cpp (97%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/drvs/drv_vdvd_dummy.cpp (88%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/drvs/drv_vdvd_image.cpp (92%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/drvs/drv_vhd_base.cpp (97%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/drvs/drv_vhd_dummy.cpp (93%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/drvs/drv_vhd_image.cpp (97%) rename modules/core/src/common/{vixen => strikebox}/hw/ata/drvs/util.cpp (81%) rename modules/core/src/common/{vixen => strikebox}/hw/atapi/atapi_common.cpp (97%) rename modules/core/src/common/{vixen => strikebox}/hw/atapi/cmds/atapi_command.cpp (93%) rename modules/core/src/common/{vixen => strikebox}/hw/atapi/cmds/cmd_mode_sense_10.cpp (95%) rename modules/core/src/common/{vixen => strikebox}/hw/atapi/cmds/cmd_read_10.cpp (97%) rename modules/core/src/common/{vixen => strikebox}/hw/atapi/cmds/cmd_read_capacity.cpp (95%) rename modules/core/src/common/{vixen => strikebox}/hw/atapi/cmds/cmd_read_dvd_structure.cpp (97%) rename modules/core/src/common/{vixen => strikebox}/hw/atapi/cmds/cmd_test_unit_ready.cpp (95%) rename modules/core/src/common/{vixen => strikebox}/hw/atapi/cmds/proto_data_in.cpp (95%) rename modules/core/src/common/{vixen => strikebox}/hw/atapi/cmds/proto_nondata.cpp (93%) create mode 100644 modules/core/src/common/strikebox/hw/basic/char.cpp rename modules/core/src/common/{vixen => strikebox}/hw/basic/char_null.cpp (89%) rename modules/core/src/common/{vixen => strikebox}/hw/basic/cmos.cpp (98%) rename modules/core/src/common/{vixen => strikebox}/hw/basic/gsi.cpp (83%) rename modules/core/src/common/{vixen => strikebox}/hw/basic/i8254.cpp (97%) rename modules/core/src/common/{vixen => strikebox}/hw/basic/i8259.cpp (99%) rename modules/core/src/common/{vixen => strikebox}/hw/basic/irq.cpp (79%) rename modules/core/src/common/{vixen => strikebox}/hw/basic/mcpx.cpp (84%) rename modules/core/src/common/{vixen => strikebox}/hw/basic/serial.cpp (99%) rename modules/core/src/common/{vixen => strikebox}/hw/basic/superio.cpp (97%) rename modules/core/src/common/{vixen => strikebox}/hw/bus/isabus.cpp (93%) rename modules/core/src/common/{vixen => strikebox}/hw/bus/pcibus.cpp (98%) rename modules/core/src/common/{vixen => strikebox}/hw/bus/smbus.cpp (98%) rename modules/core/src/common/{vixen => strikebox}/hw/ohci/ohci.cpp (99%) rename modules/core/src/common/{vixen => strikebox}/hw/ohci/ohci_hub.cpp (99%) rename modules/core/src/common/{vixen => strikebox}/hw/pci/ac97.cpp (95%) rename modules/core/src/common/{vixen => strikebox}/hw/pci/agpbridge.cpp (95%) rename modules/core/src/common/{vixen => strikebox}/hw/pci/bmide.cpp (97%) rename modules/core/src/common/{vixen => strikebox}/hw/pci/bmide_channel.cpp (98%) rename modules/core/src/common/{vixen => strikebox}/hw/pci/hostbridge.cpp (96%) rename modules/core/src/common/{vixen => strikebox}/hw/pci/lpc.cpp (98%) rename modules/core/src/common/{vixen => strikebox}/hw/pci/mcpx_ram.cpp (86%) rename modules/core/src/common/{vixen => strikebox}/hw/pci/nv2a.cpp (99%) rename modules/core/src/common/{vixen => strikebox}/hw/pci/nvapu.cpp (98%) rename modules/core/src/common/{vixen => strikebox}/hw/pci/nvnet.cpp (99%) rename modules/core/src/common/{vixen => strikebox}/hw/pci/pci.cpp (98%) rename modules/core/src/common/{vixen => strikebox}/hw/pci/pci_irq.cpp (82%) rename modules/core/src/common/{vixen => strikebox}/hw/pci/pcibridge.cpp (97%) rename modules/core/src/common/{vixen => strikebox}/hw/pci/usb_pci.cpp (99%) rename modules/core/src/common/{vixen => strikebox}/hw/sm/adm1032.cpp (94%) rename modules/core/src/common/{vixen => strikebox}/hw/sm/eeprom.cpp (94%) create mode 100644 modules/core/src/common/strikebox/hw/sm/sm.cpp rename modules/core/src/common/{vixen => strikebox}/hw/sm/smc.cpp (98%) rename modules/core/src/common/{vixen => strikebox}/hw/sm/tvenc.cpp (92%) rename modules/core/src/common/{vixen => strikebox}/hw/sm/tvenc_conexant.cpp (94%) rename modules/core/src/common/{vixen => strikebox}/hw/xid/xid_gamepad.cpp (99%) rename modules/core/src/common/{vixen => strikebox}/io.cpp (98%) rename modules/core/src/common/{vixen => strikebox}/iovec.cpp (98%) rename modules/core/src/common/{vixen => strikebox}/log.cpp (85%) rename modules/core/src/common/{vixen => strikebox}/timer.cpp (90%) create mode 100644 modules/core/src/common/strikebox/util/fifo.cpp rename modules/core/src/common/{vixen => strikebox}/util/invoke_later.cpp (96%) rename modules/core/src/common/{vixen => strikebox}/xbox.cpp (98%) delete mode 100644 modules/core/src/common/vixen/hw/basic/char.cpp delete mode 100644 modules/core/src/common/vixen/hw/sm/sm.cpp delete mode 100644 modules/core/src/common/vixen/util/fifo.cpp rename modules/core/src/windows/{vixen => strikebox}/hw/basic/win32/char_serial.cpp (98%) rename modules/core/src/windows/{vixen => strikebox}/hw/basic/win32/char_serial.h (88%) rename modules/core/src/windows/{vixen => strikebox}/hw/basic/win32/mt_serial.cpp (99%) rename modules/core/src/windows/{vixen => strikebox}/hw/basic/win32/mt_serial.h (99%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b05b660..bbd2022 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,7 +24,7 @@ cmake_minimum_required(VERSION 3.8) -project(vixen VERSION 1.0.0) +project(strikebox VERSION 1.0.0) # Differentiate between Linux and macOS if(UNIX AND NOT APPLE) @@ -38,7 +38,7 @@ if(MSVC) set_property(GLOBAL PROPERTY USE_FOLDERS ON) # Configure startup project - set_property(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}" PROPERTY VS_STARTUP_PROJECT vixen-cli) + set_property(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}" PROPERTY VS_STARTUP_PROJECT strikebox-cli) endif() include(cmake/PrecompiledHeader.cmake) diff --git a/Doxyfile b/Doxyfile index f50f210..4d30ccf 100644 --- a/Doxyfile +++ b/Doxyfile @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = "viXen" +PROJECT_NAME = "StrikeBox" # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version diff --git a/README.md b/README.md index a4bfb4a..3cf6c10 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,12 @@ or [Cxbx-Reloaded](https://github.com/Cxbx-Reloaded/Cxbx-Reloaded).** --- -# viXen -6th Generation (Original) Xbox Emulator +# StrikeBox +Original Xbox Emulator A fork of [OpenXBOX](https://github.com/mborgerson/OpenXBOX) by mborgerson, with a focus on LLE emulation. HLE kernel was an original goal of OpenXBOX; it -will come later in viXen. +will come later in StrikeBox. The current state of this thing is just a tad bit more tangible than vaporware. Essentially right now it just initializes an x86 system (courtesy of one of the @@ -23,18 +23,20 @@ networking nothing is really playable... yet ;) The initial goal is to emulate the original Xbox at a low level. The user will have to provide their own dump of the MCPX and BIOS ROMs from an Xbox machine, -as well as the appropriate game media dump in XISO format or from an extracted -directory and a hard disk image containing the system software. +as well as the appropriate game media dump in XISO format and a hard disk image +containing the system software. -In the future, viXen will attempt to provide high level emulation of the kernel -in order to sidestep the ROM and dashboard requirements. It is a long way off, -as research on the kernel is still incipient and existing implementations are -incomplete, incorrect or straight up copies of illegally obtained code. +In the future, StrikeBox will attempt to provide high level emulation of the +kernel in order to sidestep the ROM and dashboard requirements. It is a long +way off, as research on the kernel is still incipient and existing +implementations are incomplete, incorrect or straight up copies of illegally +obtained code. How to Build ------------ -viXen uses [CMake](https://cmake.org/) build files to generate projects for -your preferred development platform. You'll need CMake 3.8 or later. +StrikeBox uses [CMake](https://cmake.org/) build files to generate projects for +your preferred development platform. You'll need CMake 3.8 or later and the +[virt86](https://github.com/StrikerX3/virt86) library. ### Windows To make a [Visual Studio 2017](https://www.visualstudio.com/downloads/) @@ -55,7 +57,7 @@ $ sudo apt-get install cmake $ mkdir build; cd build $ cmake .. && make $ cd src/cli -$ ./vixen-cli -m -b -d -r [debug|retail] +$ ./strikebox-cli -m -b -d -r [debug|retail] ``` ### macOS diff --git a/apps/cli/CMakeLists.txt b/apps/cli/CMakeLists.txt index b7c05e0..48173ba 100644 --- a/apps/cli/CMakeLists.txt +++ b/apps/cli/CMakeLists.txt @@ -1,4 +1,4 @@ -project(vixen-cli VERSION 1.0.0 LANGUAGES CXX) +project(strikebox-cli VERSION 1.0.0 LANGUAGES CXX) ############################## # Source files @@ -20,19 +20,19 @@ file(GLOB_RECURSE public_headers ############################## # Project structure # -add_executable(vixen-cli ${sources} ${private_headers} ${public_headers}) +add_executable(strikebox-cli ${sources} ${private_headers} ${public_headers}) -target_include_directories(vixen-cli +target_include_directories(strikebox-cli PUBLIC $ $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ) -target_link_libraries(vixen-cli vixen-core) +target_link_libraries(strikebox-cli strikebox-core) if(MSVC) - add_precompiled_header(vixen-cli pch.hpp SOURCE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/src/pch.cpp" FORCEINCLUDE) + add_precompiled_header(strikebox-cli pch.hpp SOURCE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/src/pch.cpp" FORCEINCLUDE) vs_set_filters(BASE_DIR src FILTER_ROOT "Sources" SOURCES ${sources}) vs_set_filters(BASE_DIR src FILTER_ROOT "Private Headers" SOURCES ${private_headers}) @@ -40,15 +40,15 @@ if(MSVC) vs_use_edit_and_continue() - set_target_properties(vixen-cli PROPERTIES FOLDER Applications) + set_target_properties(strikebox-cli PROPERTIES FOLDER Applications) else() - add_precompiled_header(vixen-cli src/pch.hpp PCH_PATH pch.hpp SOURCE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/src/pch.cpp" FORCEINCLUDE) + add_precompiled_header(strikebox-cli src/pch.hpp PCH_PATH pch.hpp SOURCE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/src/pch.cpp" FORCEINCLUDE) endif() ############################## # Installation # -install(TARGETS vixen-cli +install(TARGETS strikebox-cli EXPORT platform-check RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" ) diff --git a/apps/cli/src/main.cpp b/apps/cli/src/main.cpp index 85eac17..479b201 100644 --- a/apps/cli/src/main.cpp +++ b/apps/cli/src/main.cpp @@ -5,9 +5,9 @@ #include "lib/cxxopts.hpp" -#include "vixen/core.h" -#include "vixen/settings.h" -#include "vixen/thread.h" +#include "strikebox/core.h" +#include "strikebox/settings.h" +#include "strikebox/thread.h" using namespace virt86; @@ -31,15 +31,15 @@ char *basename(char *path) * Program entry point */ int main(int argc, const char *argv[]) { - using namespace vixen; + using namespace strikebox; Thread_SetName("[Core] Main Thread"); - auto info = GetViXenInfo(); - printf("viXen v%s\n", info->version); + auto info = GetStrikeBoxInfo(); + printf("StrikeBox v%s\n", info->version); printf("------------------\n"); - cxxopts::Options options(basename((char*)argv[0]), "viXen - 6th generation (Original) XBOX Emulator\n"); + cxxopts::Options options(basename((char*)argv[0]), "StrikeBox - Original XBOX Emulator\n"); options.custom_help("-m mcpx_path -b bios_path -r xbox_rev [-d image_path] [-g image_path]"); options.add_options() ("m, mcpx", "Path to MCPX ROM", cxxopts::value(), "mcpx_path") diff --git a/apps/cli/src/pch.hpp b/apps/cli/src/pch.hpp index 81b9968..7048435 100644 --- a/apps/cli/src/pch.hpp +++ b/apps/cli/src/pch.hpp @@ -1,5 +1,5 @@ /* -Precompiled header for the Platform Checker application. +Precompiled header for StrikeBox CLI. ------------------------------------------------------------------------------- MIT License diff --git a/modules/core/CMakeLists.txt b/modules/core/CMakeLists.txt index 19288f7..827fc74 100644 --- a/modules/core/CMakeLists.txt +++ b/modules/core/CMakeLists.txt @@ -1,4 +1,4 @@ -# The core of the viXen emulator. +# The core of the StrikeBox emulator. # ------------------------------------------------------------------------------- # MIT License # @@ -21,7 +21,7 @@ # 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. -project(vixen-core VERSION 1.0.0 LANGUAGES CXX) +project(strikebox-core VERSION 1.0.0 LANGUAGES CXX) include(ExternalProject) @@ -61,11 +61,11 @@ file(GLOB_RECURSE public_headers # Project structure # -add_library(vixen-core OBJECT ${sources} ${private_headers} ${public_headers}) +add_library(strikebox-core OBJECT ${sources} ${private_headers} ${public_headers}) -set_target_properties(vixen-core PROPERTIES DEBUG_POSTFIX "-debug") +set_target_properties(strikebox-core PROPERTIES DEBUG_POSTFIX "-debug") -target_include_directories(vixen-core +target_include_directories(strikebox-core PUBLIC $ $ @@ -76,7 +76,7 @@ target_include_directories(vixen-core # Include virt86 find_package(virt86 CONFIG REQUIRED) -target_link_libraries(vixen-core PUBLIC virt86::virt86) +target_link_libraries(strikebox-core PUBLIC virt86::virt86) # TODO: Include Zydis # add_definitions(-DZYDIS_STATIC_DEFINE) @@ -87,19 +87,19 @@ target_link_libraries(vixen-core PUBLIC virt86::virt86) # UPDATE_COMMAND "" # INSTALL_COMMAND "") # ExternalProject_Get_Property(Zydis install_dir) -# target_include_directories(vixen-core PUBLIC ${install_dir}/src/Zydis/include ${install_dir}/src/Zydis-build) -# add_dependencies(vixen-core Zydis) +# target_include_directories(strikebox-core PUBLIC ${install_dir}/src/Zydis/include ${install_dir}/src/Zydis-build) +# add_dependencies(strikebox-core Zydis) # # if(WIN32) -# target_link_libraries(vixen-core PUBLIC ${install_dir}/src/Zydis-build/${CMAKE_CFG_INTDIR}/Zydis.lib) +# target_link_libraries(strikebox-core PUBLIC ${install_dir}/src/Zydis-build/${CMAKE_CFG_INTDIR}/Zydis.lib) # else() -# target_link_libraries(vixen-core PUBLIC ${install_dir}/src/Zydis-build/libZydis.a) +# target_link_libraries(strikebox-core PUBLIC ${install_dir}/src/Zydis-build/libZydis.a) # endif() # -# target_include_directories(vixen-core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${install_dir}/src/Zydis/include) +# target_include_directories(strikebox-core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${install_dir}/src/Zydis/include) if(MSVC) - add_precompiled_header(vixen-core pch.hpp SOURCE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/src/common/pch.cpp" FORCEINCLUDE) + add_precompiled_header(strikebox-core pch.hpp SOURCE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/src/common/pch.cpp" FORCEINCLUDE) vs_set_filters(BASE_DIR src FILTER_ROOT "Sources" SOURCES ${sources}) vs_set_filters(BASE_DIR src FILTER_ROOT "Private Headers" SOURCES ${private_headers}) @@ -107,9 +107,9 @@ if(MSVC) vs_use_edit_and_continue() - set_target_properties(vixen-core PROPERTIES FOLDER Libraries) + set_target_properties(strikebox-core PROPERTIES FOLDER Libraries) else() - add_precompiled_header(vixen-core src/common/pch.hpp PCH_PATH pch.hpp SOURCE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/src/common/pch.cpp" FORCEINCLUDE) + add_precompiled_header(strikebox-core src/common/pch.hpp PCH_PATH pch.hpp SOURCE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/src/common/pch.cpp" FORCEINCLUDE) endif() ############################## @@ -122,7 +122,7 @@ set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated") set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake") set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake") set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets") -set(namespace "vixen::") +set(namespace "strikebox::") # Include module with function 'write_basic_package_version_file' include(CMakePackageConfigHelpers) @@ -145,7 +145,7 @@ configure_package_config_file( ) # Install target library -install(TARGETS vixen-core +install(TARGETS strikebox-core EXPORT "${TARGETS_EXPORT_NAME}" LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" diff --git a/modules/core/include/vixen/alloc.h b/modules/core/include/strikebox/alloc.h similarity index 88% rename from modules/core/include/vixen/alloc.h rename to modules/core/include/strikebox/alloc.h index 7096e2d..791cd57 100644 --- a/modules/core/include/vixen/alloc.h +++ b/modules/core/include/strikebox/alloc.h @@ -2,7 +2,7 @@ #include -namespace vixen { +namespace strikebox { #ifdef _WIN32 #define valloc(size) _aligned_malloc((size), 4096) diff --git a/modules/core/include/strikebox/core.h b/modules/core/include/strikebox/core.h new file mode 100644 index 0000000..d6c328b --- /dev/null +++ b/modules/core/include/strikebox/core.h @@ -0,0 +1,14 @@ +#pragma once + +#include "strikebox/xbox.h" + +namespace strikebox { + +struct StrikeBoxInfo { + const char *version; + const uint64_t versionId; +}; + +const struct StrikeBoxInfo * GetStrikeBoxInfo(); + +} diff --git a/modules/core/include/vixen/cxbxtimer.h b/modules/core/include/strikebox/cxbxtimer.h similarity index 99% rename from modules/core/include/vixen/cxbxtimer.h rename to modules/core/include/strikebox/cxbxtimer.h index 848230e..4557330 100644 --- a/modules/core/include/vixen/cxbxtimer.h +++ b/modules/core/include/strikebox/cxbxtimer.h @@ -39,7 +39,7 @@ #include -namespace vixen { +namespace strikebox { /* typedef of the timer object and the callback function */ typedef void(*pTimerCB)(void*); diff --git a/modules/core/include/vixen/debug.h b/modules/core/include/strikebox/debug.h similarity index 91% rename from modules/core/include/vixen/debug.h rename to modules/core/include/strikebox/debug.h index ce30cc8..b3b12e2 100644 --- a/modules/core/include/vixen/debug.h +++ b/modules/core/include/strikebox/debug.h @@ -2,9 +2,9 @@ #include "virt86/virt86.hpp" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { /*! * Print the CPU registers diff --git a/modules/core/include/vixen/dynamic_variant.h b/modules/core/include/strikebox/dynamic_variant.h similarity index 98% rename from modules/core/include/vixen/dynamic_variant.h rename to modules/core/include/strikebox/dynamic_variant.h index a54bd61..a17ccec 100644 --- a/modules/core/include/vixen/dynamic_variant.h +++ b/modules/core/include/strikebox/dynamic_variant.h @@ -2,7 +2,7 @@ #include -namespace vixen { +namespace strikebox { /*! * Stores any type of object. diff --git a/modules/core/include/vixen/gdbserver.h b/modules/core/include/strikebox/gdbserver.h similarity index 99% rename from modules/core/include/vixen/gdbserver.h rename to modules/core/include/strikebox/gdbserver.h index c74621b..d80ae6c 100644 --- a/modules/core/include/vixen/gdbserver.h +++ b/modules/core/include/strikebox/gdbserver.h @@ -39,7 +39,7 @@ #include "virt86/virt86.hpp" -namespace vixen { +namespace strikebox { #ifdef _WIN32 typedef int socklen_t; diff --git a/modules/core/include/vixen/hw/ata/ata.h b/modules/core/include/strikebox/hw/ata/ata.h similarity index 95% rename from modules/core/include/vixen/hw/ata/ata.h rename to modules/core/include/strikebox/hw/ata/ata.h index e3d5591..49a8aa2 100644 --- a/modules/core/include/vixen/hw/ata/ata.h +++ b/modules/core/include/strikebox/hw/ata/ata.h @@ -14,11 +14,11 @@ #include #include "../basic/irq.h" -#include "vixen/io.h" +#include "strikebox/io.h" #include "ata_defs.h" #include "ata_channel.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/include/vixen/hw/ata/ata_channel.h b/modules/core/include/strikebox/hw/ata/ata_channel.h similarity index 98% rename from modules/core/include/vixen/hw/ata/ata_channel.h rename to modules/core/include/strikebox/hw/ata/ata_channel.h index 2244fe0..47c1dbd 100644 --- a/modules/core/include/vixen/hw/ata/ata_channel.h +++ b/modules/core/include/strikebox/hw/ata/ata_channel.h @@ -15,7 +15,7 @@ #include -#include "vixen/dynamic_variant.h" +#include "strikebox/dynamic_variant.h" #include "../basic/irq.h" #include "../basic/interrupt.h" #include "ata_device.h" @@ -31,7 +31,7 @@ #include "cmds/cmd_set_features.h" #include "cmds/cmd_write_dma.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/include/vixen/hw/ata/ata_common.h b/modules/core/include/strikebox/hw/ata/ata_common.h similarity index 98% rename from modules/core/include/vixen/hw/ata/ata_common.h rename to modules/core/include/strikebox/hw/ata/ata_common.h index fa7b302..055d277 100644 --- a/modules/core/include/vixen/hw/ata/ata_common.h +++ b/modules/core/include/strikebox/hw/ata/ata_common.h @@ -15,7 +15,7 @@ #include "../ata/ata_defs.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/include/vixen/hw/ata/ata_defs.h b/modules/core/include/strikebox/hw/ata/ata_defs.h similarity index 99% rename from modules/core/include/vixen/hw/ata/ata_defs.h rename to modules/core/include/strikebox/hw/ata/ata_defs.h index d0f3269..b5e2364 100644 --- a/modules/core/include/vixen/hw/ata/ata_defs.h +++ b/modules/core/include/strikebox/hw/ata/ata_defs.h @@ -13,7 +13,7 @@ #include -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/include/vixen/hw/ata/ata_device.h b/modules/core/include/strikebox/hw/ata/ata_device.h similarity index 98% rename from modules/core/include/vixen/hw/ata/ata_device.h rename to modules/core/include/strikebox/hw/ata/ata_device.h index 3bc5b36..759b227 100644 --- a/modules/core/include/vixen/hw/ata/ata_device.h +++ b/modules/core/include/strikebox/hw/ata/ata_device.h @@ -19,7 +19,7 @@ #include "drvs/ata_device_driver.h" #include "drvs/drv_null.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/include/vixen/hw/ata/cmds/ata_command.h b/modules/core/include/strikebox/hw/ata/cmds/ata_command.h similarity index 97% rename from modules/core/include/vixen/hw/ata/cmds/ata_command.h rename to modules/core/include/strikebox/hw/ata/cmds/ata_command.h index 2899279..4191d3d 100644 --- a/modules/core/include/vixen/hw/ata/cmds/ata_command.h +++ b/modules/core/include/strikebox/hw/ata/cmds/ata_command.h @@ -13,10 +13,10 @@ #include -#include "vixen/dynamic_variant.h" +#include "strikebox/dynamic_variant.h" #include "../ata_device.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/include/vixen/hw/ata/cmds/cmd_identify_device.h b/modules/core/include/strikebox/hw/ata/cmds/cmd_identify_device.h similarity index 97% rename from modules/core/include/vixen/hw/ata/cmds/cmd_identify_device.h rename to modules/core/include/strikebox/hw/ata/cmds/cmd_identify_device.h index 6d6518e..26c3acd 100644 --- a/modules/core/include/vixen/hw/ata/cmds/cmd_identify_device.h +++ b/modules/core/include/strikebox/hw/ata/cmds/cmd_identify_device.h @@ -15,7 +15,7 @@ #include "proto_pio_data_in.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/include/vixen/hw/ata/cmds/cmd_identify_packet_device.h b/modules/core/include/strikebox/hw/ata/cmds/cmd_identify_packet_device.h similarity index 98% rename from modules/core/include/vixen/hw/ata/cmds/cmd_identify_packet_device.h rename to modules/core/include/strikebox/hw/ata/cmds/cmd_identify_packet_device.h index 51faa47..28e0daa 100644 --- a/modules/core/include/vixen/hw/ata/cmds/cmd_identify_packet_device.h +++ b/modules/core/include/strikebox/hw/ata/cmds/cmd_identify_packet_device.h @@ -15,7 +15,7 @@ #include "proto_pio_data_in.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/include/vixen/hw/ata/cmds/cmd_init_dev_params.h b/modules/core/include/strikebox/hw/ata/cmds/cmd_init_dev_params.h similarity index 97% rename from modules/core/include/vixen/hw/ata/cmds/cmd_init_dev_params.h rename to modules/core/include/strikebox/hw/ata/cmds/cmd_init_dev_params.h index 4c81abe..6bf5976 100644 --- a/modules/core/include/vixen/hw/ata/cmds/cmd_init_dev_params.h +++ b/modules/core/include/strikebox/hw/ata/cmds/cmd_init_dev_params.h @@ -15,7 +15,7 @@ #include "proto_nondata.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/include/vixen/hw/ata/cmds/cmd_packet.h b/modules/core/include/strikebox/hw/ata/cmds/cmd_packet.h similarity index 97% rename from modules/core/include/vixen/hw/ata/cmds/cmd_packet.h rename to modules/core/include/strikebox/hw/ata/cmds/cmd_packet.h index 707925b..b12838c 100644 --- a/modules/core/include/vixen/hw/ata/cmds/cmd_packet.h +++ b/modules/core/include/strikebox/hw/ata/cmds/cmd_packet.h @@ -15,7 +15,7 @@ #include "proto_packet.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/include/vixen/hw/ata/cmds/cmd_read_dma.h b/modules/core/include/strikebox/hw/ata/cmds/cmd_read_dma.h similarity index 97% rename from modules/core/include/vixen/hw/ata/cmds/cmd_read_dma.h rename to modules/core/include/strikebox/hw/ata/cmds/cmd_read_dma.h index a1dd67f..aa555b4 100644 --- a/modules/core/include/vixen/hw/ata/cmds/cmd_read_dma.h +++ b/modules/core/include/strikebox/hw/ata/cmds/cmd_read_dma.h @@ -15,7 +15,7 @@ #include "proto_dma.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/include/vixen/hw/ata/cmds/cmd_security_unlock.h b/modules/core/include/strikebox/hw/ata/cmds/cmd_security_unlock.h similarity index 97% rename from modules/core/include/vixen/hw/ata/cmds/cmd_security_unlock.h rename to modules/core/include/strikebox/hw/ata/cmds/cmd_security_unlock.h index 4a920e7..b3b7dce 100644 --- a/modules/core/include/vixen/hw/ata/cmds/cmd_security_unlock.h +++ b/modules/core/include/strikebox/hw/ata/cmds/cmd_security_unlock.h @@ -15,7 +15,7 @@ #include "proto_pio_data_out.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/include/vixen/hw/ata/cmds/cmd_set_features.h b/modules/core/include/strikebox/hw/ata/cmds/cmd_set_features.h similarity index 98% rename from modules/core/include/vixen/hw/ata/cmds/cmd_set_features.h rename to modules/core/include/strikebox/hw/ata/cmds/cmd_set_features.h index f180b39..d6835b7 100644 --- a/modules/core/include/vixen/hw/ata/cmds/cmd_set_features.h +++ b/modules/core/include/strikebox/hw/ata/cmds/cmd_set_features.h @@ -15,7 +15,7 @@ #include "proto_nondata.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/include/vixen/hw/ata/cmds/cmd_write_dma.h b/modules/core/include/strikebox/hw/ata/cmds/cmd_write_dma.h similarity index 97% rename from modules/core/include/vixen/hw/ata/cmds/cmd_write_dma.h rename to modules/core/include/strikebox/hw/ata/cmds/cmd_write_dma.h index 191a296..3a12139 100644 --- a/modules/core/include/vixen/hw/ata/cmds/cmd_write_dma.h +++ b/modules/core/include/strikebox/hw/ata/cmds/cmd_write_dma.h @@ -15,7 +15,7 @@ #include "proto_dma.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/include/vixen/hw/ata/cmds/proto_dma.h b/modules/core/include/strikebox/hw/ata/cmds/proto_dma.h similarity index 98% rename from modules/core/include/vixen/hw/ata/cmds/proto_dma.h rename to modules/core/include/strikebox/hw/ata/cmds/proto_dma.h index 71b0961..2298fa2 100644 --- a/modules/core/include/vixen/hw/ata/cmds/proto_dma.h +++ b/modules/core/include/strikebox/hw/ata/cmds/proto_dma.h @@ -15,7 +15,7 @@ #include "ata_command.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/include/vixen/hw/ata/cmds/proto_nondata.h b/modules/core/include/strikebox/hw/ata/cmds/proto_nondata.h similarity index 98% rename from modules/core/include/vixen/hw/ata/cmds/proto_nondata.h rename to modules/core/include/strikebox/hw/ata/cmds/proto_nondata.h index 9f081c1..92ab9bc 100644 --- a/modules/core/include/vixen/hw/ata/cmds/proto_nondata.h +++ b/modules/core/include/strikebox/hw/ata/cmds/proto_nondata.h @@ -15,7 +15,7 @@ #include "ata_command.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/include/vixen/hw/ata/cmds/proto_packet.h b/modules/core/include/strikebox/hw/ata/cmds/proto_packet.h similarity index 89% rename from modules/core/include/vixen/hw/ata/cmds/proto_packet.h rename to modules/core/include/strikebox/hw/ata/cmds/proto_packet.h index 8ecb3ba..23822a1 100644 --- a/modules/core/include/vixen/hw/ata/cmds/proto_packet.h +++ b/modules/core/include/strikebox/hw/ata/cmds/proto_packet.h @@ -14,13 +14,13 @@ #include #include "ata_command.h" -#include "vixen/hw/atapi/cmds/cmd_mode_sense_10.h" -#include "vixen/hw/atapi/cmds/cmd_read_10.h" -#include "vixen/hw/atapi/cmds/cmd_read_capacity.h" -#include "vixen/hw/atapi/cmds/cmd_read_dvd_structure.h" -#include "vixen/hw/atapi/cmds/cmd_test_unit_ready.h" +#include "strikebox/hw/atapi/cmds/cmd_mode_sense_10.h" +#include "strikebox/hw/atapi/cmds/cmd_read_10.h" +#include "strikebox/hw/atapi/cmds/cmd_read_capacity.h" +#include "strikebox/hw/atapi/cmds/cmd_read_dvd_structure.h" +#include "strikebox/hw/atapi/cmds/cmd_test_unit_ready.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/include/vixen/hw/ata/cmds/proto_pio_data_in.h b/modules/core/include/strikebox/hw/ata/cmds/proto_pio_data_in.h similarity index 98% rename from modules/core/include/vixen/hw/ata/cmds/proto_pio_data_in.h rename to modules/core/include/strikebox/hw/ata/cmds/proto_pio_data_in.h index 51b188c..63a045d 100644 --- a/modules/core/include/vixen/hw/ata/cmds/proto_pio_data_in.h +++ b/modules/core/include/strikebox/hw/ata/cmds/proto_pio_data_in.h @@ -15,7 +15,7 @@ #include "ata_command.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/include/vixen/hw/ata/cmds/proto_pio_data_out.h b/modules/core/include/strikebox/hw/ata/cmds/proto_pio_data_out.h similarity index 98% rename from modules/core/include/vixen/hw/ata/cmds/proto_pio_data_out.h rename to modules/core/include/strikebox/hw/ata/cmds/proto_pio_data_out.h index fc22ba3..bc46d1c 100644 --- a/modules/core/include/vixen/hw/ata/cmds/proto_pio_data_out.h +++ b/modules/core/include/strikebox/hw/ata/cmds/proto_pio_data_out.h @@ -15,7 +15,7 @@ #include "ata_command.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/include/vixen/hw/ata/drvs/ata_device_driver.h b/modules/core/include/strikebox/hw/ata/drvs/ata_device_driver.h similarity index 99% rename from modules/core/include/vixen/hw/ata/drvs/ata_device_driver.h rename to modules/core/include/strikebox/hw/ata/drvs/ata_device_driver.h index d436539..7f05c83 100644 --- a/modules/core/include/vixen/hw/ata/drvs/ata_device_driver.h +++ b/modules/core/include/strikebox/hw/ata/drvs/ata_device_driver.h @@ -18,7 +18,7 @@ #include "../ata_common.h" #include "util.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/include/vixen/hw/ata/drvs/drv_null.h b/modules/core/include/strikebox/hw/ata/drvs/drv_null.h similarity index 99% rename from modules/core/include/vixen/hw/ata/drvs/drv_null.h rename to modules/core/include/strikebox/hw/ata/drvs/drv_null.h index 88c3d65..f95c546 100644 --- a/modules/core/include/vixen/hw/ata/drvs/drv_null.h +++ b/modules/core/include/strikebox/hw/ata/drvs/drv_null.h @@ -15,7 +15,7 @@ #include "ata_device_driver.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/include/vixen/hw/ata/drvs/drv_vdvd_base.h b/modules/core/include/strikebox/hw/ata/drvs/drv_vdvd_base.h similarity index 99% rename from modules/core/include/vixen/hw/ata/drvs/drv_vdvd_base.h rename to modules/core/include/strikebox/hw/ata/drvs/drv_vdvd_base.h index 97f230c..0bdc443 100644 --- a/modules/core/include/vixen/hw/ata/drvs/drv_vdvd_base.h +++ b/modules/core/include/strikebox/hw/ata/drvs/drv_vdvd_base.h @@ -15,7 +15,7 @@ #include "ata_device_driver.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/include/vixen/hw/ata/drvs/drv_vdvd_dummy.h b/modules/core/include/strikebox/hw/ata/drvs/drv_vdvd_dummy.h similarity index 98% rename from modules/core/include/vixen/hw/ata/drvs/drv_vdvd_dummy.h rename to modules/core/include/strikebox/hw/ata/drvs/drv_vdvd_dummy.h index 6456bcb..6a0d073 100644 --- a/modules/core/include/vixen/hw/ata/drvs/drv_vdvd_dummy.h +++ b/modules/core/include/strikebox/hw/ata/drvs/drv_vdvd_dummy.h @@ -15,7 +15,7 @@ #include "drv_vdvd_base.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/include/vixen/hw/ata/drvs/drv_vdvd_image.h b/modules/core/include/strikebox/hw/ata/drvs/drv_vdvd_image.h similarity index 98% rename from modules/core/include/vixen/hw/ata/drvs/drv_vdvd_image.h rename to modules/core/include/strikebox/hw/ata/drvs/drv_vdvd_image.h index 8e9d842..02cc1e2 100644 --- a/modules/core/include/vixen/hw/ata/drvs/drv_vdvd_image.h +++ b/modules/core/include/strikebox/hw/ata/drvs/drv_vdvd_image.h @@ -15,7 +15,7 @@ #include "drv_vdvd_base.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/include/vixen/hw/ata/drvs/drv_vhd_base.h b/modules/core/include/strikebox/hw/ata/drvs/drv_vhd_base.h similarity index 99% rename from modules/core/include/vixen/hw/ata/drvs/drv_vhd_base.h rename to modules/core/include/strikebox/hw/ata/drvs/drv_vhd_base.h index b2b1c9a..79585ae 100644 --- a/modules/core/include/vixen/hw/ata/drvs/drv_vhd_base.h +++ b/modules/core/include/strikebox/hw/ata/drvs/drv_vhd_base.h @@ -15,7 +15,7 @@ #include "ata_device_driver.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/include/vixen/hw/ata/drvs/drv_vhd_dummy.h b/modules/core/include/strikebox/hw/ata/drvs/drv_vhd_dummy.h similarity index 98% rename from modules/core/include/vixen/hw/ata/drvs/drv_vhd_dummy.h rename to modules/core/include/strikebox/hw/ata/drvs/drv_vhd_dummy.h index 48e9a0f..837263f 100644 --- a/modules/core/include/vixen/hw/ata/drvs/drv_vhd_dummy.h +++ b/modules/core/include/strikebox/hw/ata/drvs/drv_vhd_dummy.h @@ -15,7 +15,7 @@ #include "drv_vhd_base.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/include/vixen/hw/ata/drvs/drv_vhd_image.h b/modules/core/include/strikebox/hw/ata/drvs/drv_vhd_image.h similarity index 98% rename from modules/core/include/vixen/hw/ata/drvs/drv_vhd_image.h rename to modules/core/include/strikebox/hw/ata/drvs/drv_vhd_image.h index 030789a..4d0566f 100644 --- a/modules/core/include/vixen/hw/ata/drvs/drv_vhd_image.h +++ b/modules/core/include/strikebox/hw/ata/drvs/drv_vhd_image.h @@ -15,7 +15,7 @@ #include "drv_vhd_base.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/include/vixen/hw/ata/drvs/util.h b/modules/core/include/strikebox/hw/ata/drvs/util.h similarity index 86% rename from modules/core/include/vixen/hw/ata/drvs/util.h rename to modules/core/include/strikebox/hw/ata/drvs/util.h index 89019a8..b5c4661 100644 --- a/modules/core/include/vixen/hw/ata/drvs/util.h +++ b/modules/core/include/strikebox/hw/ata/drvs/util.h @@ -2,7 +2,7 @@ #include -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/include/vixen/hw/atapi/atapi_common.h b/modules/core/include/strikebox/hw/atapi/atapi_common.h similarity index 99% rename from modules/core/include/vixen/hw/atapi/atapi_common.h rename to modules/core/include/strikebox/hw/atapi/atapi_common.h index 55804c2..677bf43 100644 --- a/modules/core/include/vixen/hw/atapi/atapi_common.h +++ b/modules/core/include/strikebox/hw/atapi/atapi_common.h @@ -32,7 +32,7 @@ #include "atapi_defs.h" -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { diff --git a/modules/core/include/vixen/hw/atapi/atapi_defs.h b/modules/core/include/strikebox/hw/atapi/atapi_defs.h similarity index 99% rename from modules/core/include/vixen/hw/atapi/atapi_defs.h rename to modules/core/include/strikebox/hw/atapi/atapi_defs.h index 5b68155..db87adb 100644 --- a/modules/core/include/vixen/hw/atapi/atapi_defs.h +++ b/modules/core/include/strikebox/hw/atapi/atapi_defs.h @@ -30,7 +30,7 @@ #include -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { diff --git a/modules/core/include/vixen/hw/atapi/atapi_utils.h b/modules/core/include/strikebox/hw/atapi/atapi_utils.h similarity index 99% rename from modules/core/include/vixen/hw/atapi/atapi_utils.h rename to modules/core/include/strikebox/hw/atapi/atapi_utils.h index 332cb3d..b152b8a 100644 --- a/modules/core/include/vixen/hw/atapi/atapi_utils.h +++ b/modules/core/include/strikebox/hw/atapi/atapi_utils.h @@ -30,7 +30,7 @@ #include -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { diff --git a/modules/core/include/vixen/hw/atapi/atapi_xbox.h b/modules/core/include/strikebox/hw/atapi/atapi_xbox.h similarity index 97% rename from modules/core/include/vixen/hw/atapi/atapi_xbox.h rename to modules/core/include/strikebox/hw/atapi/atapi_xbox.h index 5622cd9..5ba4ef6 100644 --- a/modules/core/include/vixen/hw/atapi/atapi_xbox.h +++ b/modules/core/include/strikebox/hw/atapi/atapi_xbox.h @@ -13,7 +13,7 @@ #include -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { diff --git a/modules/core/include/vixen/hw/atapi/cmds/atapi_command.h b/modules/core/include/strikebox/hw/atapi/cmds/atapi_command.h similarity index 97% rename from modules/core/include/vixen/hw/atapi/cmds/atapi_command.h rename to modules/core/include/strikebox/hw/atapi/cmds/atapi_command.h index 3c2738f..dcc92c0 100644 --- a/modules/core/include/vixen/hw/atapi/cmds/atapi_command.h +++ b/modules/core/include/strikebox/hw/atapi/cmds/atapi_command.h @@ -33,9 +33,9 @@ #include "../atapi_common.h" #include "../atapi_utils.h" #include "../atapi_xbox.h" -#include "vixen/hw/ata/drvs/ata_device_driver.h" +#include "strikebox/hw/ata/drvs/ata_device_driver.h" -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { namespace cmd { diff --git a/modules/core/include/vixen/hw/atapi/cmds/cmd_mode_sense_10.h b/modules/core/include/strikebox/hw/atapi/cmds/cmd_mode_sense_10.h similarity index 98% rename from modules/core/include/vixen/hw/atapi/cmds/cmd_mode_sense_10.h rename to modules/core/include/strikebox/hw/atapi/cmds/cmd_mode_sense_10.h index 6d7bacf..e094764 100644 --- a/modules/core/include/vixen/hw/atapi/cmds/cmd_mode_sense_10.h +++ b/modules/core/include/strikebox/hw/atapi/cmds/cmd_mode_sense_10.h @@ -32,7 +32,7 @@ #include "proto_data_in.h" -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { namespace cmd { diff --git a/modules/core/include/vixen/hw/atapi/cmds/cmd_read_10.h b/modules/core/include/strikebox/hw/atapi/cmds/cmd_read_10.h similarity index 98% rename from modules/core/include/vixen/hw/atapi/cmds/cmd_read_10.h rename to modules/core/include/strikebox/hw/atapi/cmds/cmd_read_10.h index 5bd2f03..aa4de54 100644 --- a/modules/core/include/vixen/hw/atapi/cmds/cmd_read_10.h +++ b/modules/core/include/strikebox/hw/atapi/cmds/cmd_read_10.h @@ -32,7 +32,7 @@ #include "proto_data_in.h" -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { namespace cmd { diff --git a/modules/core/include/vixen/hw/atapi/cmds/cmd_read_capacity.h b/modules/core/include/strikebox/hw/atapi/cmds/cmd_read_capacity.h similarity index 98% rename from modules/core/include/vixen/hw/atapi/cmds/cmd_read_capacity.h rename to modules/core/include/strikebox/hw/atapi/cmds/cmd_read_capacity.h index 5e8ff47..1a4cce6 100644 --- a/modules/core/include/vixen/hw/atapi/cmds/cmd_read_capacity.h +++ b/modules/core/include/strikebox/hw/atapi/cmds/cmd_read_capacity.h @@ -32,7 +32,7 @@ #include "proto_data_in.h" -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { namespace cmd { diff --git a/modules/core/include/vixen/hw/atapi/cmds/cmd_read_dvd_structure.h b/modules/core/include/strikebox/hw/atapi/cmds/cmd_read_dvd_structure.h similarity index 98% rename from modules/core/include/vixen/hw/atapi/cmds/cmd_read_dvd_structure.h rename to modules/core/include/strikebox/hw/atapi/cmds/cmd_read_dvd_structure.h index d9521f9..4743efe 100644 --- a/modules/core/include/vixen/hw/atapi/cmds/cmd_read_dvd_structure.h +++ b/modules/core/include/strikebox/hw/atapi/cmds/cmd_read_dvd_structure.h @@ -32,7 +32,7 @@ #include "proto_data_in.h" -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { namespace cmd { diff --git a/modules/core/include/vixen/hw/atapi/cmds/cmd_test_unit_ready.h b/modules/core/include/strikebox/hw/atapi/cmds/cmd_test_unit_ready.h similarity index 98% rename from modules/core/include/vixen/hw/atapi/cmds/cmd_test_unit_ready.h rename to modules/core/include/strikebox/hw/atapi/cmds/cmd_test_unit_ready.h index 20d3339..bbed82e 100644 --- a/modules/core/include/vixen/hw/atapi/cmds/cmd_test_unit_ready.h +++ b/modules/core/include/strikebox/hw/atapi/cmds/cmd_test_unit_ready.h @@ -32,7 +32,7 @@ #include "proto_nondata.h" -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { namespace cmd { diff --git a/modules/core/include/vixen/hw/atapi/cmds/proto_data_in.h b/modules/core/include/strikebox/hw/atapi/cmds/proto_data_in.h similarity index 99% rename from modules/core/include/vixen/hw/atapi/cmds/proto_data_in.h rename to modules/core/include/strikebox/hw/atapi/cmds/proto_data_in.h index 8d5d60a..808b48b 100644 --- a/modules/core/include/vixen/hw/atapi/cmds/proto_data_in.h +++ b/modules/core/include/strikebox/hw/atapi/cmds/proto_data_in.h @@ -32,7 +32,7 @@ #include "atapi_command.h" -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { namespace cmd { diff --git a/modules/core/include/vixen/hw/atapi/cmds/proto_nondata.h b/modules/core/include/strikebox/hw/atapi/cmds/proto_nondata.h similarity index 98% rename from modules/core/include/vixen/hw/atapi/cmds/proto_nondata.h rename to modules/core/include/strikebox/hw/atapi/cmds/proto_nondata.h index 0c26769..ebd878c 100644 --- a/modules/core/include/vixen/hw/atapi/cmds/proto_nondata.h +++ b/modules/core/include/strikebox/hw/atapi/cmds/proto_nondata.h @@ -32,7 +32,7 @@ #include "atapi_command.h" -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { namespace cmd { diff --git a/modules/core/include/vixen/hw/basic/char.h b/modules/core/include/strikebox/hw/basic/char.h similarity index 97% rename from modules/core/include/vixen/hw/basic/char.h rename to modules/core/include/strikebox/hw/basic/char.h index a4ca6dd..bbeaded 100644 --- a/modules/core/include/vixen/hw/basic/char.h +++ b/modules/core/include/strikebox/hw/basic/char.h @@ -2,9 +2,9 @@ #include -#include "vixen/util/fifo.h" +#include "strikebox/util/fifo.h" -namespace vixen { +namespace strikebox { #define CHR_EVENT_BREAK 0 // Serial break char #define CHR_EVENT_FOCUS 1 // Focus to this terminal (modal input needed) diff --git a/modules/core/include/vixen/hw/basic/char_null.h b/modules/core/include/strikebox/hw/basic/char_null.h similarity index 94% rename from modules/core/include/vixen/hw/basic/char_null.h rename to modules/core/include/strikebox/hw/basic/char_null.h index f94d52a..3d377d5 100644 --- a/modules/core/include/vixen/hw/basic/char_null.h +++ b/modules/core/include/strikebox/hw/basic/char_null.h @@ -4,7 +4,7 @@ #include "char.h" -namespace vixen { +namespace strikebox { class NullCharDriver : public CharDriver { public: diff --git a/modules/core/include/vixen/hw/basic/cmos.h b/modules/core/include/strikebox/hw/basic/cmos.h similarity index 97% rename from modules/core/include/vixen/hw/basic/cmos.h rename to modules/core/include/strikebox/hw/basic/cmos.h index cc2dce5..016eb88 100644 --- a/modules/core/include/vixen/hw/basic/cmos.h +++ b/modules/core/include/strikebox/hw/basic/cmos.h @@ -1,11 +1,11 @@ #pragma once -#include "vixen/io.h" +#include "strikebox/io.h" #include #include -namespace vixen { +namespace strikebox { #define CMOS_IRQ 8 diff --git a/modules/core/include/vixen/hw/basic/gsi.h b/modules/core/include/strikebox/hw/basic/gsi.h similarity index 94% rename from modules/core/include/vixen/hw/basic/gsi.h rename to modules/core/include/strikebox/hw/basic/gsi.h index 19ba39a..7ac5e60 100644 --- a/modules/core/include/vixen/hw/basic/gsi.h +++ b/modules/core/include/strikebox/hw/basic/gsi.h @@ -6,7 +6,7 @@ #include "ioapic.h" #include "../bus/isabus.h" -namespace vixen { +namespace strikebox { #define GSI_NUM_PINS IOAPIC_NUM_PINS diff --git a/modules/core/include/vixen/hw/basic/i8254.h b/modules/core/include/strikebox/hw/basic/i8254.h similarity index 94% rename from modules/core/include/vixen/hw/basic/i8254.h rename to modules/core/include/strikebox/hw/basic/i8254.h index c751939..f1142ec 100644 --- a/modules/core/include/vixen/hw/basic/i8254.h +++ b/modules/core/include/strikebox/hw/basic/i8254.h @@ -4,9 +4,9 @@ #include #include "irq.h" -#include "vixen/io.h" +#include "strikebox/io.h" -namespace vixen { +namespace strikebox { #define PORT_PIT_DATA_0 0x40 #define PORT_PIT_DATA_1 0x41 diff --git a/modules/core/include/vixen/hw/basic/i8259.h b/modules/core/include/strikebox/hw/basic/i8259.h similarity index 97% rename from modules/core/include/vixen/hw/basic/i8259.h rename to modules/core/include/strikebox/hw/basic/i8259.h index 0d5cd6a..e1bb12e 100644 --- a/modules/core/include/vixen/hw/basic/i8259.h +++ b/modules/core/include/strikebox/hw/basic/i8259.h @@ -5,10 +5,10 @@ #include "virt86/virt86.hpp" -#include "vixen/io.h" +#include "strikebox/io.h" #include "irq.h" -namespace vixen { +namespace strikebox { #define PORT_PIC_MASTER_COMMAND 0x20 #define PORT_PIC_MASTER_DATA 0x21 diff --git a/modules/core/include/vixen/hw/basic/interrupt.h b/modules/core/include/strikebox/hw/basic/interrupt.h similarity index 90% rename from modules/core/include/vixen/hw/basic/interrupt.h rename to modules/core/include/strikebox/hw/basic/interrupt.h index a603dcd..7fc692b 100644 --- a/modules/core/include/vixen/hw/basic/interrupt.h +++ b/modules/core/include/strikebox/hw/basic/interrupt.h @@ -1,6 +1,6 @@ #pragma once -namespace vixen { +namespace strikebox { namespace hw { class InterruptTrigger { diff --git a/modules/core/include/vixen/hw/basic/ioapic.h b/modules/core/include/strikebox/hw/basic/ioapic.h similarity index 67% rename from modules/core/include/vixen/hw/basic/ioapic.h rename to modules/core/include/strikebox/hw/basic/ioapic.h index 77731b6..c2b87ff 100644 --- a/modules/core/include/vixen/hw/basic/ioapic.h +++ b/modules/core/include/strikebox/hw/basic/ioapic.h @@ -1,6 +1,6 @@ #pragma once -namespace vixen { +namespace strikebox { #define IOAPIC_NUM_PINS 24 diff --git a/modules/core/include/vixen/hw/basic/irq.h b/modules/core/include/strikebox/hw/basic/irq.h similarity index 94% rename from modules/core/include/vixen/hw/basic/irq.h rename to modules/core/include/strikebox/hw/basic/irq.h index 6ee51b2..9247a01 100644 --- a/modules/core/include/vixen/hw/basic/irq.h +++ b/modules/core/include/strikebox/hw/basic/irq.h @@ -2,7 +2,7 @@ #include -namespace vixen { +namespace strikebox { class IRQHandler { public: diff --git a/modules/core/include/vixen/hw/basic/mcpx.h b/modules/core/include/strikebox/hw/basic/mcpx.h similarity index 93% rename from modules/core/include/vixen/hw/basic/mcpx.h rename to modules/core/include/strikebox/hw/basic/mcpx.h index 04bfe27..6899433 100644 --- a/modules/core/include/vixen/hw/basic/mcpx.h +++ b/modules/core/include/strikebox/hw/basic/mcpx.h @@ -4,7 +4,7 @@ #include "../defs.h" -namespace vixen { +namespace strikebox { // MCPX ROM versions. typedef enum { diff --git a/modules/core/include/vixen/hw/basic/serial.h b/modules/core/include/strikebox/hw/basic/serial.h similarity index 95% rename from modules/core/include/vixen/hw/basic/serial.h rename to modules/core/include/strikebox/hw/basic/serial.h index dc1890c..e715457 100644 --- a/modules/core/include/vixen/hw/basic/serial.h +++ b/modules/core/include/strikebox/hw/basic/serial.h @@ -2,15 +2,15 @@ #include -#include "vixen/io.h" -#include "vixen/util/fifo.h" -#include "vixen/util/invoke_later.h" +#include "strikebox/io.h" +#include "strikebox/util/fifo.h" +#include "strikebox/util/invoke_later.h" #include "char.h" #include "../basic/irq.h" #include -namespace vixen { +namespace strikebox { #define UART_FIFO_LENGTH 16 diff --git a/modules/core/include/vixen/hw/basic/superio.h b/modules/core/include/strikebox/hw/basic/superio.h similarity index 98% rename from modules/core/include/vixen/hw/basic/superio.h rename to modules/core/include/strikebox/hw/basic/superio.h index 027e4ac..f127ec1 100644 --- a/modules/core/include/vixen/hw/basic/superio.h +++ b/modules/core/include/strikebox/hw/basic/superio.h @@ -4,7 +4,7 @@ #include "serial.h" -namespace vixen { +namespace strikebox { #define PORT_SUPERIO_CONFIG 0x2E #define PORT_SUPERIO_DATA 0x2F diff --git a/modules/core/include/vixen/hw/bus/isabus.h b/modules/core/include/strikebox/hw/bus/isabus.h similarity index 89% rename from modules/core/include/vixen/hw/bus/isabus.h rename to modules/core/include/strikebox/hw/bus/isabus.h index 795f418..3c8b4ac 100644 --- a/modules/core/include/vixen/hw/bus/isabus.h +++ b/modules/core/include/strikebox/hw/bus/isabus.h @@ -2,7 +2,7 @@ #include "../basic/irq.h" -namespace vixen { +namespace strikebox { #define ISA_NUM_IRQS 16 diff --git a/modules/core/include/vixen/hw/bus/pcibus.h b/modules/core/include/strikebox/hw/bus/pcibus.h similarity index 96% rename from modules/core/include/vixen/hw/bus/pcibus.h rename to modules/core/include/strikebox/hw/bus/pcibus.h index d15fab4..327c79d 100644 --- a/modules/core/include/vixen/hw/bus/pcibus.h +++ b/modules/core/include/strikebox/hw/bus/pcibus.h @@ -2,11 +2,11 @@ #include "../pci/pci_irq.h" #include "../pci/pci.h" -#include "vixen/io.h" +#include "strikebox/io.h" #include -namespace vixen { +namespace strikebox { #define PORT_PCI_CONFIG_ADDRESS 0xCF8 #define PORT_PCI_CONFIG_DATA 0xCFC diff --git a/modules/core/include/vixen/hw/bus/smbus.h b/modules/core/include/strikebox/hw/bus/smbus.h similarity index 98% rename from modules/core/include/vixen/hw/bus/smbus.h rename to modules/core/include/strikebox/hw/bus/smbus.h index 213f1b1..c5df9a4 100644 --- a/modules/core/include/vixen/hw/bus/smbus.h +++ b/modules/core/include/strikebox/hw/bus/smbus.h @@ -6,7 +6,7 @@ #include -namespace vixen { +namespace strikebox { #define SMB_ADDR_OFFSET 0xE0 #define SMB_IOSIZE 16 diff --git a/modules/core/include/vixen/hw/defs.h b/modules/core/include/strikebox/hw/defs.h similarity index 97% rename from modules/core/include/vixen/hw/defs.h rename to modules/core/include/strikebox/hw/defs.h index 865ed32..692b2f7 100644 --- a/modules/core/include/vixen/hw/defs.h +++ b/modules/core/include/strikebox/hw/defs.h @@ -2,7 +2,7 @@ #include -namespace vixen { +namespace strikebox { // Constants for SMBus device addresses. // The constants point to the write address. diff --git a/modules/core/include/vixen/hw/nv2a/defs.h b/modules/core/include/strikebox/hw/nv2a/defs.h similarity index 99% rename from modules/core/include/vixen/hw/nv2a/defs.h rename to modules/core/include/strikebox/hw/nv2a/defs.h index 9d6e414..c571011 100644 --- a/modules/core/include/vixen/hw/nv2a/defs.h +++ b/modules/core/include/strikebox/hw/nv2a/defs.h @@ -5,7 +5,7 @@ #include #include "nv2a_int.h" -namespace vixen { +namespace strikebox { #define NV2A_SIZE 0x01000000 diff --git a/modules/core/include/vixen/hw/nv2a/nv2a_int.h b/modules/core/include/strikebox/hw/nv2a/nv2a_int.h similarity index 100% rename from modules/core/include/vixen/hw/nv2a/nv2a_int.h rename to modules/core/include/strikebox/hw/nv2a/nv2a_int.h diff --git a/modules/core/include/vixen/hw/nv2a/vga.h b/modules/core/include/strikebox/hw/nv2a/vga.h similarity index 100% rename from modules/core/include/vixen/hw/nv2a/vga.h rename to modules/core/include/strikebox/hw/nv2a/vga.h diff --git a/modules/core/include/vixen/hw/ohci/ohci.h b/modules/core/include/strikebox/hw/ohci/ohci.h similarity index 99% rename from modules/core/include/vixen/hw/ohci/ohci.h rename to modules/core/include/strikebox/hw/ohci/ohci.h index 95fd5d2..8ed7761 100644 --- a/modules/core/include/vixen/hw/ohci/ohci.h +++ b/modules/core/include/strikebox/hw/ohci/ohci.h @@ -43,9 +43,9 @@ #include "virt86/virt86.hpp" #include "../pci/usb_pci.h" -#include "vixen/cxbxtimer.h" +#include "strikebox/cxbxtimer.h" -namespace vixen { +namespace strikebox { // Abbreviations used: // OHCI: Open Host Controller Interface; the standard used on the Xbox to comunicate with the usb devices diff --git a/modules/core/include/vixen/hw/ohci/ohci_common.h b/modules/core/include/strikebox/hw/ohci/ohci_common.h similarity index 99% rename from modules/core/include/vixen/hw/ohci/ohci_common.h rename to modules/core/include/strikebox/hw/ohci/ohci_common.h index c1ee4b7..bd27a10 100644 --- a/modules/core/include/vixen/hw/ohci/ohci_common.h +++ b/modules/core/include/strikebox/hw/ohci/ohci_common.h @@ -40,10 +40,10 @@ #pragma once -#include "vixen/queue.h" -#include "vixen/iovec.h" +#include "strikebox/queue.h" +#include "strikebox/iovec.h" -namespace vixen { +namespace strikebox { #define USB_MAX_ENDPOINTS 15 #define USB_MAX_INTERFACES 16 @@ -248,7 +248,7 @@ struct USBDescID { uint16_t bcdDevice; // device release number in binary-coded decimal uint8_t iManufacturer; // index of string descriptor describing manufacturer uint8_t iProduct; // index of string descriptor describing product - uint8_t iSerialNumber; // index of string descriptor describing the device’s serial number + uint8_t iSerialNumber; // index of string descriptor describing the device's serial number }; /* Global USB Descriptor struct */ diff --git a/modules/core/include/vixen/hw/ohci/ohci_hub.h b/modules/core/include/strikebox/hw/ohci/ohci_hub.h similarity index 99% rename from modules/core/include/vixen/hw/ohci/ohci_hub.h rename to modules/core/include/strikebox/hw/ohci/ohci_hub.h index 789a0e1..a876e20 100644 --- a/modules/core/include/vixen/hw/ohci/ohci_hub.h +++ b/modules/core/include/strikebox/hw/ohci/ohci_hub.h @@ -42,7 +42,7 @@ #include "../pci/usb_pci.h" -namespace vixen { +namespace strikebox { #define NUM_PORTS 8 diff --git a/modules/core/include/vixen/hw/pci/ac97.h b/modules/core/include/strikebox/hw/pci/ac97.h similarity index 96% rename from modules/core/include/vixen/hw/pci/ac97.h rename to modules/core/include/strikebox/hw/pci/ac97.h index 6371a0e..c42caf6 100644 --- a/modules/core/include/vixen/hw/pci/ac97.h +++ b/modules/core/include/strikebox/hw/pci/ac97.h @@ -5,7 +5,7 @@ #include "../defs.h" #include "pci.h" -namespace vixen { +namespace strikebox { class AC97Device : public PCIDevice { public: diff --git a/modules/core/include/vixen/hw/pci/agpbridge.h b/modules/core/include/strikebox/hw/pci/agpbridge.h similarity index 92% rename from modules/core/include/vixen/hw/pci/agpbridge.h rename to modules/core/include/strikebox/hw/pci/agpbridge.h index a106a80..6c21313 100644 --- a/modules/core/include/vixen/hw/pci/agpbridge.h +++ b/modules/core/include/strikebox/hw/pci/agpbridge.h @@ -5,7 +5,7 @@ #include "../defs.h" #include "pcibridge.h" -namespace vixen { +namespace strikebox { class AGPBridgeDevice : public PCIBridgeDevice { public: diff --git a/modules/core/include/vixen/hw/pci/bmide.h b/modules/core/include/strikebox/hw/pci/bmide.h similarity index 94% rename from modules/core/include/vixen/hw/pci/bmide.h rename to modules/core/include/strikebox/hw/pci/bmide.h index f0b93ea..1757b91 100644 --- a/modules/core/include/vixen/hw/pci/bmide.h +++ b/modules/core/include/strikebox/hw/pci/bmide.h @@ -14,9 +14,9 @@ #include "pci.h" #include "bmide_defs.h" #include "bmide_channel.h" -#include "vixen/hw/ata/ata.h" +#include "strikebox/hw/ata/ata.h" -namespace vixen { +namespace strikebox { namespace hw { namespace bmide { diff --git a/modules/core/include/vixen/hw/pci/bmide_channel.h b/modules/core/include/strikebox/hw/pci/bmide_channel.h similarity index 94% rename from modules/core/include/vixen/hw/pci/bmide_channel.h rename to modules/core/include/strikebox/hw/pci/bmide_channel.h index c07eca8..f9494ae 100644 --- a/modules/core/include/vixen/hw/pci/bmide_channel.h +++ b/modules/core/include/strikebox/hw/pci/bmide_channel.h @@ -10,11 +10,11 @@ #include #include -#include "vixen/hw/pci/bmide_defs.h" -#include "vixen/hw/ata/ata_common.h" -#include "vixen/hw/ata/ata.h" +#include "strikebox/hw/pci/bmide_defs.h" +#include "strikebox/hw/ata/ata_common.h" +#include "strikebox/hw/ata/ata.h" -namespace vixen { +namespace strikebox { namespace hw { namespace bmide { diff --git a/modules/core/include/vixen/hw/pci/bmide_defs.h b/modules/core/include/strikebox/hw/pci/bmide_defs.h similarity index 99% rename from modules/core/include/vixen/hw/pci/bmide_defs.h rename to modules/core/include/strikebox/hw/pci/bmide_defs.h index bf68d1c..00b5304 100644 --- a/modules/core/include/vixen/hw/pci/bmide_defs.h +++ b/modules/core/include/strikebox/hw/pci/bmide_defs.h @@ -9,7 +9,7 @@ #include -namespace vixen { +namespace strikebox { namespace hw { namespace bmide { diff --git a/modules/core/include/vixen/hw/pci/hostbridge.h b/modules/core/include/strikebox/hw/pci/hostbridge.h similarity index 95% rename from modules/core/include/vixen/hw/pci/hostbridge.h rename to modules/core/include/strikebox/hw/pci/hostbridge.h index 68bc420..6106c01 100644 --- a/modules/core/include/vixen/hw/pci/hostbridge.h +++ b/modules/core/include/strikebox/hw/pci/hostbridge.h @@ -5,7 +5,7 @@ #include "../defs.h" #include "pci.h" -namespace vixen { +namespace strikebox { class HostBridgeDevice : public PCIDevice { public: diff --git a/modules/core/include/vixen/hw/pci/lpc.h b/modules/core/include/strikebox/hw/pci/lpc.h similarity index 98% rename from modules/core/include/vixen/hw/pci/lpc.h rename to modules/core/include/strikebox/hw/pci/lpc.h index 69adcf0..5f09528 100644 --- a/modules/core/include/vixen/hw/pci/lpc.h +++ b/modules/core/include/strikebox/hw/pci/lpc.h @@ -8,7 +8,7 @@ #include "../basic/irq.h" #include "../bus/isabus.h" -namespace vixen { +namespace strikebox { #define XBOX_NUM_INT_IRQS 8 #define XBOX_NUM_PIRQS 4 diff --git a/modules/core/include/vixen/hw/pci/mcpx_ram.h b/modules/core/include/strikebox/hw/pci/mcpx_ram.h similarity index 94% rename from modules/core/include/vixen/hw/pci/mcpx_ram.h rename to modules/core/include/strikebox/hw/pci/mcpx_ram.h index 48e2fa2..72fbe49 100644 --- a/modules/core/include/vixen/hw/pci/mcpx_ram.h +++ b/modules/core/include/strikebox/hw/pci/mcpx_ram.h @@ -6,7 +6,7 @@ #include "pci.h" #include "../basic/mcpx.h" -namespace vixen { +namespace strikebox { class MCPXRAMDevice : public PCIDevice { public: diff --git a/modules/core/include/vixen/hw/pci/nv2a.h b/modules/core/include/strikebox/hw/pci/nv2a.h similarity index 99% rename from modules/core/include/vixen/hw/pci/nv2a.h rename to modules/core/include/strikebox/hw/pci/nv2a.h index 0ef43d8..67c56de 100644 --- a/modules/core/include/vixen/hw/pci/nv2a.h +++ b/modules/core/include/strikebox/hw/pci/nv2a.h @@ -8,7 +8,7 @@ #include "../nv2a/vga.h" #include "../basic/irq.h" -namespace vixen { +namespace strikebox { class NV2ADevice : public PCIDevice { public: diff --git a/modules/core/include/vixen/hw/pci/nvapu.h b/modules/core/include/strikebox/hw/pci/nvapu.h similarity index 99% rename from modules/core/include/vixen/hw/pci/nvapu.h rename to modules/core/include/strikebox/hw/pci/nvapu.h index 787647b..55ab5a0 100644 --- a/modules/core/include/vixen/hw/pci/nvapu.h +++ b/modules/core/include/strikebox/hw/pci/nvapu.h @@ -45,7 +45,7 @@ #include "../defs.h" #include "pci.h" -namespace vixen { +namespace strikebox { #define APU_VP_BASE 0x20000 #define APU_VP_SIZE 0x10000 diff --git a/modules/core/include/vixen/hw/pci/nvnet.h b/modules/core/include/strikebox/hw/pci/nvnet.h similarity index 96% rename from modules/core/include/vixen/hw/pci/nvnet.h rename to modules/core/include/strikebox/hw/pci/nvnet.h index b54ace6..2ed3f88 100644 --- a/modules/core/include/vixen/hw/pci/nvnet.h +++ b/modules/core/include/strikebox/hw/pci/nvnet.h @@ -2,7 +2,7 @@ #include "pci.h" -namespace vixen { +namespace strikebox { #define NVNET_ADDR 0xFEF00000 #define NVNET_SIZE 0x00000400 diff --git a/modules/core/include/vixen/hw/pci/pci.h b/modules/core/include/strikebox/hw/pci/pci.h similarity index 99% rename from modules/core/include/vixen/hw/pci/pci.h rename to modules/core/include/strikebox/hw/pci/pci.h index d0abd43..456cf17 100644 --- a/modules/core/include/vixen/hw/pci/pci.h +++ b/modules/core/include/strikebox/hw/pci/pci.h @@ -5,7 +5,7 @@ #include "pci_regs.h" #include "pci_common.h" -namespace vixen { +namespace strikebox { #define PCI_CONFIG_HEADER_SIZE 0x40 diff --git a/modules/core/include/vixen/hw/pci/pci_common.h b/modules/core/include/strikebox/hw/pci/pci_common.h similarity index 94% rename from modules/core/include/vixen/hw/pci/pci_common.h rename to modules/core/include/strikebox/hw/pci/pci_common.h index 2038398..a95c71a 100644 --- a/modules/core/include/vixen/hw/pci/pci_common.h +++ b/modules/core/include/strikebox/hw/pci/pci_common.h @@ -2,7 +2,7 @@ #include -namespace vixen { +namespace strikebox { #define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07)) #define PCI_DEVID(bus, devfn) ((((uint16_t)(bus)) << 8) | (devfn)) diff --git a/modules/core/include/vixen/hw/pci/pci_irq.h b/modules/core/include/strikebox/hw/pci/pci_irq.h similarity index 95% rename from modules/core/include/vixen/hw/pci/pci_irq.h rename to modules/core/include/strikebox/hw/pci/pci_irq.h index 64ae382..1ad7f0f 100644 --- a/modules/core/include/vixen/hw/pci/pci_irq.h +++ b/modules/core/include/strikebox/hw/pci/pci_irq.h @@ -2,7 +2,7 @@ #include "pci.h" -namespace vixen { +namespace strikebox { #define PCI_NUM_PINS 4 diff --git a/modules/core/include/vixen/hw/pci/pci_regs.h b/modules/core/include/strikebox/hw/pci/pci_regs.h similarity index 100% rename from modules/core/include/vixen/hw/pci/pci_regs.h rename to modules/core/include/strikebox/hw/pci/pci_regs.h diff --git a/modules/core/include/vixen/hw/pci/pcibridge.h b/modules/core/include/strikebox/hw/pci/pcibridge.h similarity index 96% rename from modules/core/include/vixen/hw/pci/pcibridge.h rename to modules/core/include/strikebox/hw/pci/pcibridge.h index cd770ae..8f876ed 100644 --- a/modules/core/include/vixen/hw/pci/pcibridge.h +++ b/modules/core/include/strikebox/hw/pci/pcibridge.h @@ -7,7 +7,7 @@ #include "../bus/pcibus.h" #include "pci_irq.h" -namespace vixen { +namespace strikebox { class PCIBridgeDevice : public PCIDevice { public: diff --git a/modules/core/include/vixen/hw/pci/usb_pci.h b/modules/core/include/strikebox/hw/pci/usb_pci.h similarity index 99% rename from modules/core/include/vixen/hw/pci/usb_pci.h rename to modules/core/include/strikebox/hw/pci/usb_pci.h index a9e78f6..6c82278 100644 --- a/modules/core/include/vixen/hw/pci/usb_pci.h +++ b/modules/core/include/strikebox/hw/pci/usb_pci.h @@ -48,7 +48,7 @@ #include "pci.h" #include "../ohci/ohci_common.h" -namespace vixen { +namespace strikebox { typedef enum USBDeviceFlags { USB_DEV_FLAG_FULL_PATH, diff --git a/modules/core/include/vixen/hw/sm/adm1032.h b/modules/core/include/strikebox/hw/sm/adm1032.h similarity index 97% rename from modules/core/include/vixen/hw/sm/adm1032.h rename to modules/core/include/strikebox/hw/sm/adm1032.h index 421f986..85ed98d 100644 --- a/modules/core/include/vixen/hw/sm/adm1032.h +++ b/modules/core/include/strikebox/hw/sm/adm1032.h @@ -6,7 +6,7 @@ #include "sm.h" -namespace vixen { +namespace strikebox { enum ADM1032Register { ADM1032RegLocalTemp = 0x00, // (Read-only) Local Temperature Value diff --git a/modules/core/include/vixen/hw/sm/eeprom.h b/modules/core/include/strikebox/hw/sm/eeprom.h similarity index 97% rename from modules/core/include/vixen/hw/sm/eeprom.h rename to modules/core/include/strikebox/hw/sm/eeprom.h index e7b272f..f2a8f2a 100644 --- a/modules/core/include/vixen/hw/sm/eeprom.h +++ b/modules/core/include/strikebox/hw/sm/eeprom.h @@ -2,7 +2,7 @@ #include "sm.h" -namespace vixen { +namespace strikebox { #define EEPROM_SIZE 256 diff --git a/modules/core/include/vixen/hw/sm/led.h b/modules/core/include/strikebox/hw/sm/led.h similarity index 97% rename from modules/core/include/vixen/hw/sm/led.h rename to modules/core/include/strikebox/hw/sm/led.h index 3775c77..84ef6e3 100644 --- a/modules/core/include/vixen/hw/sm/led.h +++ b/modules/core/include/strikebox/hw/sm/led.h @@ -1,6 +1,6 @@ #pragma once -namespace vixen { +namespace strikebox { namespace LED { // See http://xboxdevwiki.net/PIC#The_LED diff --git a/modules/core/include/vixen/hw/sm/sm.h b/modules/core/include/strikebox/hw/sm/sm.h similarity index 96% rename from modules/core/include/vixen/hw/sm/sm.h rename to modules/core/include/strikebox/hw/sm/sm.h index cc73d98..e6642e4 100644 --- a/modules/core/include/vixen/hw/sm/sm.h +++ b/modules/core/include/strikebox/hw/sm/sm.h @@ -2,7 +2,7 @@ #include -namespace vixen { +namespace strikebox { class SMDevice { public: diff --git a/modules/core/include/vixen/hw/sm/smc.h b/modules/core/include/strikebox/hw/sm/smc.h similarity index 99% rename from modules/core/include/vixen/hw/sm/smc.h rename to modules/core/include/strikebox/hw/sm/smc.h index cd72ff8..15081bc 100644 --- a/modules/core/include/vixen/hw/sm/smc.h +++ b/modules/core/include/strikebox/hw/sm/smc.h @@ -5,7 +5,7 @@ #include "../defs.h" #include "sm.h" -namespace vixen { +namespace strikebox { // The picture linked below shows: // https://upload.wikimedia.org/wikipedia/commons/9/94/Xbox-Motherboard-FR.jpg diff --git a/modules/core/include/vixen/hw/sm/tvenc.h b/modules/core/include/strikebox/hw/sm/tvenc.h similarity index 94% rename from modules/core/include/vixen/hw/sm/tvenc.h rename to modules/core/include/strikebox/hw/sm/tvenc.h index cf24059..cfa72c6 100644 --- a/modules/core/include/vixen/hw/sm/tvenc.h +++ b/modules/core/include/strikebox/hw/sm/tvenc.h @@ -5,7 +5,7 @@ #include "../defs.h" #include "sm.h" -namespace vixen { +namespace strikebox { // Xbox TV encoder chips. typedef enum { diff --git a/modules/core/include/vixen/hw/sm/tvenc_conexant.h b/modules/core/include/strikebox/hw/sm/tvenc_conexant.h similarity index 96% rename from modules/core/include/vixen/hw/sm/tvenc_conexant.h rename to modules/core/include/strikebox/hw/sm/tvenc_conexant.h index cbd6697..e65985d 100644 --- a/modules/core/include/vixen/hw/sm/tvenc_conexant.h +++ b/modules/core/include/strikebox/hw/sm/tvenc_conexant.h @@ -2,7 +2,7 @@ #include "tvenc.h" -namespace vixen { +namespace strikebox { class TVEncConexantDevice : public TVEncoderDevice { public: diff --git a/modules/core/include/vixen/hw/utils.h b/modules/core/include/strikebox/hw/utils.h similarity index 97% rename from modules/core/include/vixen/hw/utils.h rename to modules/core/include/strikebox/hw/utils.h index 9e65e22..d2a5924 100644 --- a/modules/core/include/vixen/hw/utils.h +++ b/modules/core/include/strikebox/hw/utils.h @@ -2,7 +2,7 @@ #include -namespace vixen { +namespace strikebox { /*! * Get last byte of a range from offset + length. diff --git a/modules/core/include/vixen/hw/xid/xid_gamepad.h b/modules/core/include/strikebox/hw/xid/xid_gamepad.h similarity index 99% rename from modules/core/include/vixen/hw/xid/xid_gamepad.h rename to modules/core/include/strikebox/hw/xid/xid_gamepad.h index fd3b380..e25c453 100644 --- a/modules/core/include/vixen/hw/xid/xid_gamepad.h +++ b/modules/core/include/strikebox/hw/xid/xid_gamepad.h @@ -42,7 +42,7 @@ #pragma once -namespace vixen { +namespace strikebox { struct USBXIDState; // forward declare diff --git a/modules/core/include/vixen/io.h b/modules/core/include/strikebox/io.h similarity index 99% rename from modules/core/include/vixen/io.h rename to modules/core/include/strikebox/io.h index 2fa33d8..c86d2a5 100644 --- a/modules/core/include/vixen/io.h +++ b/modules/core/include/strikebox/io.h @@ -4,7 +4,7 @@ #include #include -namespace vixen { +namespace strikebox { class IOMapper; diff --git a/modules/core/include/vixen/iovec.h b/modules/core/include/strikebox/iovec.h similarity index 99% rename from modules/core/include/vixen/iovec.h rename to modules/core/include/strikebox/iovec.h index ca8eafa..36a97ac 100644 --- a/modules/core/include/vixen/iovec.h +++ b/modules/core/include/strikebox/iovec.h @@ -40,7 +40,7 @@ #include #include -namespace vixen { +namespace strikebox { /* This is a linux struct for vectored I/O. See readv() and writev() */ struct IoVec { diff --git a/modules/core/include/vixen/log.h b/modules/core/include/strikebox/log.h similarity index 97% rename from modules/core/include/vixen/log.h rename to modules/core/include/strikebox/log.h index 3cacf8b..217f530 100644 --- a/modules/core/include/vixen/log.h +++ b/modules/core/include/strikebox/log.h @@ -2,7 +2,7 @@ #include -namespace vixen { +namespace strikebox { #define LOG_LEVEL_FATAL (1) #define LOG_LEVEL_ERROR (2) diff --git a/modules/core/include/vixen/mem.h b/modules/core/include/strikebox/mem.h similarity index 97% rename from modules/core/include/vixen/mem.h rename to modules/core/include/strikebox/mem.h index 48226e1..3e1f322 100644 --- a/modules/core/include/vixen/mem.h +++ b/modules/core/include/strikebox/mem.h @@ -1,6 +1,6 @@ #pragma once -namespace vixen { +namespace strikebox { // The following physical memory ranges are reserved on all systems: // 0x00000000 - 0x00000003 :: D3D push buffer address diff --git a/modules/core/include/vixen/queue.h b/modules/core/include/strikebox/queue.h similarity index 100% rename from modules/core/include/vixen/queue.h rename to modules/core/include/strikebox/queue.h diff --git a/modules/core/include/vixen/settings.h b/modules/core/include/strikebox/settings.h similarity index 97% rename from modules/core/include/vixen/settings.h rename to modules/core/include/strikebox/settings.h index e90af68..a363ea6 100644 --- a/modules/core/include/vixen/settings.h +++ b/modules/core/include/strikebox/settings.h @@ -1,8 +1,8 @@ #pragma once -#include "vixen/hw/defs.h" +#include "strikebox/hw/defs.h" -namespace vixen { +namespace strikebox { enum CharDriverType { CHD_Null, @@ -24,7 +24,7 @@ enum VirtualDVDDriveType { // TODO: VDVD_HostDirectory // Virtual DVD drive mapped to a directory on the host }; -struct viXenSettings { +struct StrikeBoxSettings { // false: the CPU emulator will execute until interrupted // true: the CPU emulator will execute one instruction at a time bool cpu_singleStep = false; diff --git a/modules/core/include/vixen/status.h b/modules/core/include/strikebox/status.h similarity index 98% rename from modules/core/include/vixen/status.h rename to modules/core/include/strikebox/status.h index 6d253b0..4ac1c67 100644 --- a/modules/core/include/vixen/status.h +++ b/modules/core/include/strikebox/status.h @@ -1,6 +1,6 @@ #pragma once -namespace vixen { +namespace strikebox { enum EmulatorStatus { EMUS_OK = 0, // Operation completed successfully diff --git a/modules/core/include/vixen/thread.h b/modules/core/include/strikebox/thread.h similarity index 84% rename from modules/core/include/vixen/thread.h rename to modules/core/include/strikebox/thread.h index e9777a8..1acae9e 100644 --- a/modules/core/include/vixen/thread.h +++ b/modules/core/include/strikebox/thread.h @@ -2,7 +2,7 @@ #include "stdint.h" -namespace vixen { +namespace strikebox { /*! * Sets the current thread's name. diff --git a/modules/core/include/vixen/timer.h b/modules/core/include/strikebox/timer.h similarity index 94% rename from modules/core/include/vixen/timer.h rename to modules/core/include/strikebox/timer.h index 60f5c4d..84d57aa 100644 --- a/modules/core/include/vixen/timer.h +++ b/modules/core/include/strikebox/timer.h @@ -5,7 +5,7 @@ using namespace std::chrono; -namespace vixen { +namespace strikebox { /*! * Simple timer abstraction class for high-precision timing events diff --git a/modules/core/include/vixen/util.h b/modules/core/include/strikebox/util.h similarity index 98% rename from modules/core/include/vixen/util.h rename to modules/core/include/strikebox/util.h index 897168d..f466f5a 100644 --- a/modules/core/include/vixen/util.h +++ b/modules/core/include/strikebox/util.h @@ -4,7 +4,7 @@ #include #include -namespace vixen { +namespace strikebox { #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) diff --git a/modules/core/include/vixen/util/fifo.h b/modules/core/include/strikebox/util/fifo.h similarity index 96% rename from modules/core/include/vixen/util/fifo.h rename to modules/core/include/strikebox/util/fifo.h index 7e1b19a..8d27a37 100644 --- a/modules/core/include/vixen/util/fifo.h +++ b/modules/core/include/strikebox/util/fifo.h @@ -2,9 +2,9 @@ #include -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { template class Fifo { diff --git a/modules/core/include/vixen/util/invoke_later.h b/modules/core/include/strikebox/util/invoke_later.h similarity index 98% rename from modules/core/include/vixen/util/invoke_later.h rename to modules/core/include/strikebox/util/invoke_later.h index 9b225fe..5f47e4d 100644 --- a/modules/core/include/vixen/util/invoke_later.h +++ b/modules/core/include/strikebox/util/invoke_later.h @@ -4,7 +4,7 @@ #include #include -namespace vixen { +namespace strikebox { /*! * Function to be fired when scheduled. diff --git a/modules/core/include/vixen/xbox.h b/modules/core/include/strikebox/xbox.h similarity index 77% rename from modules/core/include/vixen/xbox.h rename to modules/core/include/strikebox/xbox.h index ca4fd30..75b2c8a 100644 --- a/modules/core/include/vixen/xbox.h +++ b/modules/core/include/strikebox/xbox.h @@ -12,44 +12,44 @@ #include "virt86/virt86.hpp" -#include "vixen/gdbserver.h" -#include "vixen/log.h" -#include "vixen/mem.h" -#include "vixen/util.h" -#include "vixen/thread.h" -#include "vixen/settings.h" -#include "vixen/status.h" +#include "strikebox/gdbserver.h" +#include "strikebox/log.h" +#include "strikebox/mem.h" +#include "strikebox/util.h" +#include "strikebox/thread.h" +#include "strikebox/settings.h" +#include "strikebox/status.h" -#include "vixen/hw/basic/irq.h" -#include "vixen/hw/basic/gsi.h" -#include "vixen/hw/basic/i8254.h" -#include "vixen/hw/basic/i8259.h" -#include "vixen/hw/basic/superio.h" -#include "vixen/hw/basic/cmos.h" +#include "strikebox/hw/basic/irq.h" +#include "strikebox/hw/basic/gsi.h" +#include "strikebox/hw/basic/i8254.h" +#include "strikebox/hw/basic/i8259.h" +#include "strikebox/hw/basic/superio.h" +#include "strikebox/hw/basic/cmos.h" -#include "vixen/hw/ata/ata.h" +#include "strikebox/hw/ata/ata.h" -#include "vixen/hw/bus/smbus.h" -#include "vixen/hw/bus/pcibus.h" +#include "strikebox/hw/bus/smbus.h" +#include "strikebox/hw/bus/pcibus.h" -#include "vixen/hw/sm/smc.h" -#include "vixen/hw/sm/eeprom.h" -#include "vixen/hw/sm/tvenc.h" -#include "vixen/hw/sm/adm1032.h" +#include "strikebox/hw/sm/smc.h" +#include "strikebox/hw/sm/eeprom.h" +#include "strikebox/hw/sm/tvenc.h" +#include "strikebox/hw/sm/adm1032.h" -#include "vixen/hw/pci/hostbridge.h" -#include "vixen/hw/pci/mcpx_ram.h" -#include "vixen/hw/pci/lpc.h" -#include "vixen/hw/pci/agpbridge.h" -#include "vixen/hw/pci/pcibridge.h" -#include "vixen/hw/pci/usb_pci.h" -#include "vixen/hw/pci/nvnet.h" -#include "vixen/hw/pci/nvapu.h" -#include "vixen/hw/pci/ac97.h" -#include "vixen/hw/pci/bmide.h" -#include "vixen/hw/pci/nv2a.h" +#include "strikebox/hw/pci/hostbridge.h" +#include "strikebox/hw/pci/mcpx_ram.h" +#include "strikebox/hw/pci/lpc.h" +#include "strikebox/hw/pci/agpbridge.h" +#include "strikebox/hw/pci/pcibridge.h" +#include "strikebox/hw/pci/usb_pci.h" +#include "strikebox/hw/pci/nvnet.h" +#include "strikebox/hw/pci/nvapu.h" +#include "strikebox/hw/pci/ac97.h" +#include "strikebox/hw/pci/bmide.h" +#include "strikebox/hw/pci/nv2a.h" -namespace vixen { +namespace strikebox { /*! * Xbox kernel version data structure exported by Microsoft kernels. @@ -72,8 +72,8 @@ public: Xbox(virt86::Platform& platform); virtual ~Xbox(); - viXenSettings& GetSettings() { return m_settings; } - void CopySettings(viXenSettings *settings); + StrikeBoxSettings& GetSettings() { return m_settings; } + void CopySettings(StrikeBoxSettings *settings); EmulatorStatus Run(); void Stop(); @@ -152,7 +152,7 @@ protected: NV2ADevice *m_NV2A = nullptr; // ----- Configuration ---------------------------------------------------- - viXenSettings m_settings; + StrikeBoxSettings m_settings; // ----- State ------------------------------------------------------------ bool m_should_run; diff --git a/modules/core/include/vixen/core.h b/modules/core/include/vixen/core.h deleted file mode 100644 index 09f00b6..0000000 --- a/modules/core/include/vixen/core.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "vixen/xbox.h" - -namespace vixen { - -struct viXenInfo { - const char *version; - const uint64_t versionId; -}; - -const struct viXenInfo * GetViXenInfo(); - -} diff --git a/modules/core/src/common/pch.hpp b/modules/core/src/common/pch.hpp index 5229821..d725329 100644 --- a/modules/core/src/common/pch.hpp +++ b/modules/core/src/common/pch.hpp @@ -4,9 +4,9 @@ #include "virt86/virt86.hpp" -#include "vixen/settings.h" -#include "vixen/log.h" -#include "vixen/util.h" +#include "strikebox/settings.h" +#include "strikebox/log.h" +#include "strikebox/util.h" #include #include diff --git a/modules/core/src/common/vixen/core.cpp b/modules/core/src/common/strikebox/core.cpp similarity index 77% rename from modules/core/src/common/vixen/core.cpp rename to modules/core/src/common/strikebox/core.cpp index ed8a41c..925bea9 100644 --- a/modules/core/src/common/vixen/core.cpp +++ b/modules/core/src/common/strikebox/core.cpp @@ -1,8 +1,8 @@ -#include "vixen/core.h" +#include "strikebox/core.h" #include -namespace vixen { +namespace strikebox { #define VXN_VERSION_MAJOR 0 #define VXN_VERSION_MINOR 0 @@ -17,13 +17,13 @@ namespace vixen { #define MAKE_VERSION_STRING(major, minor, patch) (STRFY(major) "." STRFY(minor) "." STRFY(patch)) #define MAKE_VERSION_ID(major, minor, patch) ((((uint64_t)major) << 48ull) | (((uint64_t)minor) << 32ull) | ((uint64_t)patch)) -static const viXenInfo g_viXenInfo = { +static const StrikeBoxInfo g_StrikeBoxInfo = { MAKE_VERSION_STRING(VXN_VERSION_MAJOR, VXN_VERSION_MINOR, VXN_VERSION_PATCH), MAKE_VERSION_ID(VXN_VERSION_MAJOR, VXN_VERSION_MINOR, VXN_VERSION_PATCH) }; -const struct viXenInfo * GetViXenInfo() { - return &g_viXenInfo; +const struct StrikeBoxInfo * GetStrikeBoxInfo() { + return &g_StrikeBoxInfo; } } diff --git a/modules/core/src/common/vixen/cxbxtimer.cpp b/modules/core/src/common/strikebox/cxbxtimer.cpp similarity index 98% rename from modules/core/src/common/vixen/cxbxtimer.cpp rename to modules/core/src/common/strikebox/cxbxtimer.cpp index 18d2521..4511b4d 100644 --- a/modules/core/src/common/vixen/cxbxtimer.cpp +++ b/modules/core/src/common/strikebox/cxbxtimer.cpp @@ -37,9 +37,9 @@ #include #include #include -#include "vixen/cxbxtimer.h" +#include "strikebox/cxbxtimer.h" -namespace vixen { +namespace strikebox { #define CLOCK_REALTIME 0 #define CLOCK_VIRTUALTIME 1 diff --git a/modules/core/src/common/vixen/debug.cpp b/modules/core/src/common/strikebox/debug.cpp similarity index 99% rename from modules/core/src/common/vixen/debug.cpp rename to modules/core/src/common/strikebox/debug.cpp index 3d06d23..1fe6ec9 100644 --- a/modules/core/src/common/vixen/debug.cpp +++ b/modules/core/src/common/strikebox/debug.cpp @@ -1,4 +1,4 @@ -#include "vixen/debug.h" +#include "strikebox/debug.h" //#include #include "virt86/virt86.hpp" @@ -6,7 +6,7 @@ #include #include -namespace vixen { +namespace strikebox { using namespace virt86; diff --git a/modules/core/src/common/vixen/gdbserver.cpp b/modules/core/src/common/strikebox/gdbserver.cpp similarity index 99% rename from modules/core/src/common/vixen/gdbserver.cpp rename to modules/core/src/common/strikebox/gdbserver.cpp index 7239ef4..e9fd4c7 100644 --- a/modules/core/src/common/vixen/gdbserver.cpp +++ b/modules/core/src/common/strikebox/gdbserver.cpp @@ -16,9 +16,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "vixen/gdbserver.h" +#include "strikebox/gdbserver.h" -namespace vixen { +namespace strikebox { using namespace virt86; diff --git a/modules/core/src/common/vixen/hw/ata/ata.cpp b/modules/core/src/common/strikebox/hw/ata/ata.cpp similarity index 96% rename from modules/core/src/common/vixen/hw/ata/ata.cpp rename to modules/core/src/common/strikebox/hw/ata/ata.cpp index 4b1c6d5..3787666 100644 --- a/modules/core/src/common/vixen/hw/ata/ata.cpp +++ b/modules/core/src/common/strikebox/hw/ata/ata.cpp @@ -9,12 +9,12 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/ata.h" +#include "strikebox/hw/ata/ata.h" -#include "vixen/log.h" -#include "vixen/io.h" +#include "strikebox/log.h" +#include "strikebox/io.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/src/common/vixen/hw/ata/ata_channel.cpp b/modules/core/src/common/strikebox/hw/ata/ata_channel.cpp similarity index 98% rename from modules/core/src/common/vixen/hw/ata/ata_channel.cpp rename to modules/core/src/common/strikebox/hw/ata/ata_channel.cpp index 9fefe23..a680335 100644 --- a/modules/core/src/common/vixen/hw/ata/ata_channel.cpp +++ b/modules/core/src/common/strikebox/hw/ata/ata_channel.cpp @@ -9,12 +9,12 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/ata.h" +#include "strikebox/hw/ata/ata.h" -#include "vixen/log.h" -#include "vixen/io.h" +#include "strikebox/log.h" +#include "strikebox/io.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/src/common/vixen/hw/ata/ata_common.cpp b/modules/core/src/common/strikebox/hw/ata/ata_common.cpp similarity index 93% rename from modules/core/src/common/vixen/hw/ata/ata_common.cpp rename to modules/core/src/common/strikebox/hw/ata/ata_common.cpp index db6ff5b..fbc278b 100644 --- a/modules/core/src/common/vixen/hw/ata/ata_common.cpp +++ b/modules/core/src/common/strikebox/hw/ata/ata_common.cpp @@ -9,9 +9,9 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/ata_common.h" +#include "strikebox/hw/ata/ata_common.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/src/common/vixen/hw/ata/ata_device.cpp b/modules/core/src/common/strikebox/hw/ata/ata_device.cpp similarity index 87% rename from modules/core/src/common/vixen/hw/ata/ata_device.cpp rename to modules/core/src/common/strikebox/hw/ata/ata_device.cpp index 4ced465..366bdfa 100644 --- a/modules/core/src/common/vixen/hw/ata/ata_device.cpp +++ b/modules/core/src/common/strikebox/hw/ata/ata_device.cpp @@ -9,12 +9,12 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/ata_device.h" +#include "strikebox/hw/ata/ata_device.h" -#include "vixen/log.h" -#include "vixen/io.h" +#include "strikebox/log.h" +#include "strikebox/io.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/src/common/vixen/hw/ata/cmds/ata_command.cpp b/modules/core/src/common/strikebox/hw/ata/cmds/ata_command.cpp similarity index 89% rename from modules/core/src/common/vixen/hw/ata/cmds/ata_command.cpp rename to modules/core/src/common/strikebox/hw/ata/cmds/ata_command.cpp index 2e861a0..74dc548 100644 --- a/modules/core/src/common/vixen/hw/ata/cmds/ata_command.cpp +++ b/modules/core/src/common/strikebox/hw/ata/cmds/ata_command.cpp @@ -9,11 +9,11 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/cmds/ata_command.h" +#include "strikebox/hw/ata/cmds/ata_command.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/ata/cmds/cmd_identify_device.cpp b/modules/core/src/common/strikebox/hw/ata/cmds/cmd_identify_device.cpp similarity index 95% rename from modules/core/src/common/vixen/hw/ata/cmds/cmd_identify_device.cpp rename to modules/core/src/common/strikebox/hw/ata/cmds/cmd_identify_device.cpp index f2088bc..4e151c5 100644 --- a/modules/core/src/common/vixen/hw/ata/cmds/cmd_identify_device.cpp +++ b/modules/core/src/common/strikebox/hw/ata/cmds/cmd_identify_device.cpp @@ -9,11 +9,11 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/cmds/cmd_identify_device.h" +#include "strikebox/hw/ata/cmds/cmd_identify_device.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/ata/cmds/cmd_identify_packet_device.cpp b/modules/core/src/common/strikebox/hw/ata/cmds/cmd_identify_packet_device.cpp similarity index 94% rename from modules/core/src/common/vixen/hw/ata/cmds/cmd_identify_packet_device.cpp rename to modules/core/src/common/strikebox/hw/ata/cmds/cmd_identify_packet_device.cpp index f925247..e4b614d 100644 --- a/modules/core/src/common/vixen/hw/ata/cmds/cmd_identify_packet_device.cpp +++ b/modules/core/src/common/strikebox/hw/ata/cmds/cmd_identify_packet_device.cpp @@ -9,11 +9,11 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/cmds/cmd_identify_packet_device.h" +#include "strikebox/hw/ata/cmds/cmd_identify_packet_device.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/ata/cmds/cmd_init_dev_params.cpp b/modules/core/src/common/strikebox/hw/ata/cmds/cmd_init_dev_params.cpp similarity index 96% rename from modules/core/src/common/vixen/hw/ata/cmds/cmd_init_dev_params.cpp rename to modules/core/src/common/strikebox/hw/ata/cmds/cmd_init_dev_params.cpp index 896f809..691aa4e 100644 --- a/modules/core/src/common/vixen/hw/ata/cmds/cmd_init_dev_params.cpp +++ b/modules/core/src/common/strikebox/hw/ata/cmds/cmd_init_dev_params.cpp @@ -9,11 +9,11 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/cmds/cmd_init_dev_params.h" +#include "strikebox/hw/ata/cmds/cmd_init_dev_params.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/ata/cmds/cmd_packet.cpp b/modules/core/src/common/strikebox/hw/ata/cmds/cmd_packet.cpp similarity index 87% rename from modules/core/src/common/vixen/hw/ata/cmds/cmd_packet.cpp rename to modules/core/src/common/strikebox/hw/ata/cmds/cmd_packet.cpp index 7ece1e4..2896a57 100644 --- a/modules/core/src/common/vixen/hw/ata/cmds/cmd_packet.cpp +++ b/modules/core/src/common/strikebox/hw/ata/cmds/cmd_packet.cpp @@ -9,11 +9,11 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/cmds/cmd_packet.h" +#include "strikebox/hw/ata/cmds/cmd_packet.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/ata/cmds/cmd_read_dma.cpp b/modules/core/src/common/strikebox/hw/ata/cmds/cmd_read_dma.cpp similarity index 86% rename from modules/core/src/common/vixen/hw/ata/cmds/cmd_read_dma.cpp rename to modules/core/src/common/strikebox/hw/ata/cmds/cmd_read_dma.cpp index 6d5d6ff..4bf8509 100644 --- a/modules/core/src/common/vixen/hw/ata/cmds/cmd_read_dma.cpp +++ b/modules/core/src/common/strikebox/hw/ata/cmds/cmd_read_dma.cpp @@ -9,11 +9,11 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/cmds/cmd_read_dma.h" +#include "strikebox/hw/ata/cmds/cmd_read_dma.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/ata/cmds/cmd_security_unlock.cpp b/modules/core/src/common/strikebox/hw/ata/cmds/cmd_security_unlock.cpp similarity index 91% rename from modules/core/src/common/vixen/hw/ata/cmds/cmd_security_unlock.cpp rename to modules/core/src/common/strikebox/hw/ata/cmds/cmd_security_unlock.cpp index 9998aad..0ab33d7 100644 --- a/modules/core/src/common/vixen/hw/ata/cmds/cmd_security_unlock.cpp +++ b/modules/core/src/common/strikebox/hw/ata/cmds/cmd_security_unlock.cpp @@ -9,11 +9,11 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/cmds/cmd_security_unlock.h" +#include "strikebox/hw/ata/cmds/cmd_security_unlock.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/ata/cmds/cmd_set_features.cpp b/modules/core/src/common/strikebox/hw/ata/cmds/cmd_set_features.cpp similarity index 98% rename from modules/core/src/common/vixen/hw/ata/cmds/cmd_set_features.cpp rename to modules/core/src/common/strikebox/hw/ata/cmds/cmd_set_features.cpp index 90f89ec..1075727 100644 --- a/modules/core/src/common/vixen/hw/ata/cmds/cmd_set_features.cpp +++ b/modules/core/src/common/strikebox/hw/ata/cmds/cmd_set_features.cpp @@ -9,11 +9,11 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/cmds/cmd_set_features.h" +#include "strikebox/hw/ata/cmds/cmd_set_features.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/ata/cmds/cmd_write_dma.cpp b/modules/core/src/common/strikebox/hw/ata/cmds/cmd_write_dma.cpp similarity index 86% rename from modules/core/src/common/vixen/hw/ata/cmds/cmd_write_dma.cpp rename to modules/core/src/common/strikebox/hw/ata/cmds/cmd_write_dma.cpp index 7bcd9ad..0e64ee3 100644 --- a/modules/core/src/common/vixen/hw/ata/cmds/cmd_write_dma.cpp +++ b/modules/core/src/common/strikebox/hw/ata/cmds/cmd_write_dma.cpp @@ -9,11 +9,11 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/cmds/cmd_write_dma.h" +#include "strikebox/hw/ata/cmds/cmd_write_dma.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/ata/cmds/proto_dma.cpp b/modules/core/src/common/strikebox/hw/ata/cmds/proto_dma.cpp similarity index 98% rename from modules/core/src/common/vixen/hw/ata/cmds/proto_dma.cpp rename to modules/core/src/common/strikebox/hw/ata/cmds/proto_dma.cpp index c845bbd..8f7adc7 100644 --- a/modules/core/src/common/vixen/hw/ata/cmds/proto_dma.cpp +++ b/modules/core/src/common/strikebox/hw/ata/cmds/proto_dma.cpp @@ -9,11 +9,11 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/cmds/proto_dma.h" +#include "strikebox/hw/ata/cmds/proto_dma.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/ata/cmds/proto_nondata.cpp b/modules/core/src/common/strikebox/hw/ata/cmds/proto_nondata.cpp similarity index 92% rename from modules/core/src/common/vixen/hw/ata/cmds/proto_nondata.cpp rename to modules/core/src/common/strikebox/hw/ata/cmds/proto_nondata.cpp index cdccb65..a6250d4 100644 --- a/modules/core/src/common/vixen/hw/ata/cmds/proto_nondata.cpp +++ b/modules/core/src/common/strikebox/hw/ata/cmds/proto_nondata.cpp @@ -9,11 +9,11 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/cmds/proto_nondata.h" +#include "strikebox/hw/ata/cmds/proto_nondata.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/ata/cmds/proto_packet.cpp b/modules/core/src/common/strikebox/hw/ata/cmds/proto_packet.cpp similarity index 97% rename from modules/core/src/common/vixen/hw/ata/cmds/proto_packet.cpp rename to modules/core/src/common/strikebox/hw/ata/cmds/proto_packet.cpp index 657a996..7549095 100644 --- a/modules/core/src/common/vixen/hw/ata/cmds/proto_packet.cpp +++ b/modules/core/src/common/strikebox/hw/ata/cmds/proto_packet.cpp @@ -9,20 +9,20 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/cmds/proto_packet.h" +#include "strikebox/hw/ata/cmds/proto_packet.h" -#include "vixen/log.h" -#include "vixen/hw/atapi/atapi_defs.h" -#include "vixen/hw/atapi/atapi_xbox.h" -#include "vixen/hw/atapi/atapi_utils.h" -#include "vixen/hw/atapi/cmds/atapi_command.h" +#include "strikebox/log.h" +#include "strikebox/hw/atapi/atapi_defs.h" +#include "strikebox/hw/atapi/atapi_xbox.h" +#include "strikebox/hw/atapi/atapi_utils.h" +#include "strikebox/hw/atapi/cmds/atapi_command.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { -using namespace vixen::hw::atapi; +using namespace strikebox::hw::atapi; // Notes regarding the protocol: // - There are two fluxograms: PIO/non-data transfers and DMA transfers diff --git a/modules/core/src/common/vixen/hw/ata/cmds/proto_pio_data_in.cpp b/modules/core/src/common/strikebox/hw/ata/cmds/proto_pio_data_in.cpp similarity index 96% rename from modules/core/src/common/vixen/hw/ata/cmds/proto_pio_data_in.cpp rename to modules/core/src/common/strikebox/hw/ata/cmds/proto_pio_data_in.cpp index e110f54..d3dc988 100644 --- a/modules/core/src/common/vixen/hw/ata/cmds/proto_pio_data_in.cpp +++ b/modules/core/src/common/strikebox/hw/ata/cmds/proto_pio_data_in.cpp @@ -9,11 +9,11 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/cmds/proto_pio_data_in.h" +#include "strikebox/hw/ata/cmds/proto_pio_data_in.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/ata/cmds/proto_pio_data_out.cpp b/modules/core/src/common/strikebox/hw/ata/cmds/proto_pio_data_out.cpp similarity index 96% rename from modules/core/src/common/vixen/hw/ata/cmds/proto_pio_data_out.cpp rename to modules/core/src/common/strikebox/hw/ata/cmds/proto_pio_data_out.cpp index 2034ac5..7cb1b83 100644 --- a/modules/core/src/common/vixen/hw/ata/cmds/proto_pio_data_out.cpp +++ b/modules/core/src/common/strikebox/hw/ata/cmds/proto_pio_data_out.cpp @@ -9,11 +9,11 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/cmds/proto_pio_data_out.h" +#include "strikebox/hw/ata/cmds/proto_pio_data_out.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/ata/drvs/ata_device_driver.cpp b/modules/core/src/common/strikebox/hw/ata/drvs/ata_device_driver.cpp similarity index 86% rename from modules/core/src/common/vixen/hw/ata/drvs/ata_device_driver.cpp rename to modules/core/src/common/strikebox/hw/ata/drvs/ata_device_driver.cpp index d1ac8c6..1014e1a 100644 --- a/modules/core/src/common/vixen/hw/ata/drvs/ata_device_driver.cpp +++ b/modules/core/src/common/strikebox/hw/ata/drvs/ata_device_driver.cpp @@ -9,12 +9,12 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/drvs/ata_device_driver.h" +#include "strikebox/hw/ata/drvs/ata_device_driver.h" -#include "vixen/log.h" -#include "vixen/io.h" +#include "strikebox/log.h" +#include "strikebox/io.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/src/common/vixen/hw/ata/drvs/drv_null.cpp b/modules/core/src/common/strikebox/hw/ata/drvs/drv_null.cpp similarity index 86% rename from modules/core/src/common/vixen/hw/ata/drvs/drv_null.cpp rename to modules/core/src/common/strikebox/hw/ata/drvs/drv_null.cpp index 40184e5..8a490e0 100644 --- a/modules/core/src/common/vixen/hw/ata/drvs/drv_null.cpp +++ b/modules/core/src/common/strikebox/hw/ata/drvs/drv_null.cpp @@ -9,12 +9,12 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/drvs/drv_null.h" +#include "strikebox/hw/ata/drvs/drv_null.h" -#include "vixen/log.h" -#include "vixen/io.h" +#include "strikebox/log.h" +#include "strikebox/io.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/src/common/vixen/hw/ata/drvs/drv_vdvd_base.cpp b/modules/core/src/common/strikebox/hw/ata/drvs/drv_vdvd_base.cpp similarity index 97% rename from modules/core/src/common/vixen/hw/ata/drvs/drv_vdvd_base.cpp rename to modules/core/src/common/strikebox/hw/ata/drvs/drv_vdvd_base.cpp index c46eae4..0e42d4c 100644 --- a/modules/core/src/common/vixen/hw/ata/drvs/drv_vdvd_base.cpp +++ b/modules/core/src/common/strikebox/hw/ata/drvs/drv_vdvd_base.cpp @@ -9,12 +9,12 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/drvs/drv_vdvd_base.h" +#include "strikebox/hw/ata/drvs/drv_vdvd_base.h" -#include "vixen/log.h" -#include "vixen/io.h" +#include "strikebox/log.h" +#include "strikebox/io.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/src/common/vixen/hw/ata/drvs/drv_vdvd_dummy.cpp b/modules/core/src/common/strikebox/hw/ata/drvs/drv_vdvd_dummy.cpp similarity index 88% rename from modules/core/src/common/vixen/hw/ata/drvs/drv_vdvd_dummy.cpp rename to modules/core/src/common/strikebox/hw/ata/drvs/drv_vdvd_dummy.cpp index 9e316bb..1555470 100644 --- a/modules/core/src/common/vixen/hw/ata/drvs/drv_vdvd_dummy.cpp +++ b/modules/core/src/common/strikebox/hw/ata/drvs/drv_vdvd_dummy.cpp @@ -9,12 +9,12 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/drvs/drv_vdvd_dummy.h" +#include "strikebox/hw/ata/drvs/drv_vdvd_dummy.h" -#include "vixen/log.h" -#include "vixen/io.h" +#include "strikebox/log.h" +#include "strikebox/io.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/src/common/vixen/hw/ata/drvs/drv_vdvd_image.cpp b/modules/core/src/common/strikebox/hw/ata/drvs/drv_vdvd_image.cpp similarity index 92% rename from modules/core/src/common/vixen/hw/ata/drvs/drv_vdvd_image.cpp rename to modules/core/src/common/strikebox/hw/ata/drvs/drv_vdvd_image.cpp index 4d659fb..05c0460 100644 --- a/modules/core/src/common/vixen/hw/ata/drvs/drv_vdvd_image.cpp +++ b/modules/core/src/common/strikebox/hw/ata/drvs/drv_vdvd_image.cpp @@ -9,15 +9,15 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/drvs/drv_vdvd_image.h" +#include "strikebox/hw/ata/drvs/drv_vdvd_image.h" -#include "vixen/log.h" -#include "vixen/io.h" -#include "vixen/hw/atapi/atapi_defs.h" -#include "vixen/hw/atapi/atapi_xbox.h" -#include "vixen/hw/atapi/atapi_utils.h" +#include "strikebox/log.h" +#include "strikebox/io.h" +#include "strikebox/hw/atapi/atapi_defs.h" +#include "strikebox/hw/atapi/atapi_xbox.h" +#include "strikebox/hw/atapi/atapi_utils.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/src/common/vixen/hw/ata/drvs/drv_vhd_base.cpp b/modules/core/src/common/strikebox/hw/ata/drvs/drv_vhd_base.cpp similarity index 97% rename from modules/core/src/common/vixen/hw/ata/drvs/drv_vhd_base.cpp rename to modules/core/src/common/strikebox/hw/ata/drvs/drv_vhd_base.cpp index 9ef6cca..da036a0 100644 --- a/modules/core/src/common/vixen/hw/ata/drvs/drv_vhd_base.cpp +++ b/modules/core/src/common/strikebox/hw/ata/drvs/drv_vhd_base.cpp @@ -9,12 +9,12 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/drvs/drv_vhd_base.h" +#include "strikebox/hw/ata/drvs/drv_vhd_base.h" -#include "vixen/log.h" -#include "vixen/io.h" +#include "strikebox/log.h" +#include "strikebox/io.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/src/common/vixen/hw/ata/drvs/drv_vhd_dummy.cpp b/modules/core/src/common/strikebox/hw/ata/drvs/drv_vhd_dummy.cpp similarity index 93% rename from modules/core/src/common/vixen/hw/ata/drvs/drv_vhd_dummy.cpp rename to modules/core/src/common/strikebox/hw/ata/drvs/drv_vhd_dummy.cpp index 2054174..5be2074 100644 --- a/modules/core/src/common/vixen/hw/ata/drvs/drv_vhd_dummy.cpp +++ b/modules/core/src/common/strikebox/hw/ata/drvs/drv_vhd_dummy.cpp @@ -9,12 +9,12 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/drvs/drv_vhd_dummy.h" +#include "strikebox/hw/ata/drvs/drv_vhd_dummy.h" -#include "vixen/log.h" -#include "vixen/io.h" +#include "strikebox/log.h" +#include "strikebox/io.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/src/common/vixen/hw/ata/drvs/drv_vhd_image.cpp b/modules/core/src/common/strikebox/hw/ata/drvs/drv_vhd_image.cpp similarity index 97% rename from modules/core/src/common/vixen/hw/ata/drvs/drv_vhd_image.cpp rename to modules/core/src/common/strikebox/hw/ata/drvs/drv_vhd_image.cpp index 9db84d2..c01b077 100644 --- a/modules/core/src/common/vixen/hw/ata/drvs/drv_vhd_image.cpp +++ b/modules/core/src/common/strikebox/hw/ata/drvs/drv_vhd_image.cpp @@ -9,12 +9,12 @@ // // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. -#include "vixen/hw/ata/drvs/drv_vhd_image.h" +#include "strikebox/hw/ata/drvs/drv_vhd_image.h" -#include "vixen/log.h" -#include "vixen/io.h" +#include "strikebox/log.h" +#include "strikebox/io.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/src/common/vixen/hw/ata/drvs/util.cpp b/modules/core/src/common/strikebox/hw/ata/drvs/util.cpp similarity index 81% rename from modules/core/src/common/vixen/hw/ata/drvs/util.cpp rename to modules/core/src/common/strikebox/hw/ata/drvs/util.cpp index b6e7b78..7d38816 100644 --- a/modules/core/src/common/vixen/hw/ata/drvs/util.cpp +++ b/modules/core/src/common/strikebox/hw/ata/drvs/util.cpp @@ -1,6 +1,6 @@ -#include "vixen/hw/ata/drvs/util.h" +#include "strikebox/hw/ata/drvs/util.h" -namespace vixen { +namespace strikebox { namespace hw { namespace ata { diff --git a/modules/core/src/common/vixen/hw/atapi/atapi_common.cpp b/modules/core/src/common/strikebox/hw/atapi/atapi_common.cpp similarity index 97% rename from modules/core/src/common/vixen/hw/atapi/atapi_common.cpp rename to modules/core/src/common/strikebox/hw/atapi/atapi_common.cpp index 9c1fc74..fd54c03 100644 --- a/modules/core/src/common/vixen/hw/atapi/atapi_common.cpp +++ b/modules/core/src/common/strikebox/hw/atapi/atapi_common.cpp @@ -26,9 +26,9 @@ // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. References are prefixed by // the letter in brackets as listed above. -#include "vixen/hw/atapi/atapi_common.h" +#include "strikebox/hw/atapi/atapi_common.h" -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { diff --git a/modules/core/src/common/vixen/hw/atapi/cmds/atapi_command.cpp b/modules/core/src/common/strikebox/hw/atapi/cmds/atapi_command.cpp similarity index 93% rename from modules/core/src/common/vixen/hw/atapi/cmds/atapi_command.cpp rename to modules/core/src/common/strikebox/hw/atapi/cmds/atapi_command.cpp index 765406c..a191f47 100644 --- a/modules/core/src/common/vixen/hw/atapi/cmds/atapi_command.cpp +++ b/modules/core/src/common/strikebox/hw/atapi/cmds/atapi_command.cpp @@ -26,11 +26,11 @@ // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. References are prefixed by // the letter in brackets as listed above. -#include "vixen/hw/atapi/cmds/atapi_command.h" +#include "strikebox/hw/atapi/cmds/atapi_command.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/atapi/cmds/cmd_mode_sense_10.cpp b/modules/core/src/common/strikebox/hw/atapi/cmds/cmd_mode_sense_10.cpp similarity index 95% rename from modules/core/src/common/vixen/hw/atapi/cmds/cmd_mode_sense_10.cpp rename to modules/core/src/common/strikebox/hw/atapi/cmds/cmd_mode_sense_10.cpp index 6baf52f..daef009 100644 --- a/modules/core/src/common/vixen/hw/atapi/cmds/cmd_mode_sense_10.cpp +++ b/modules/core/src/common/strikebox/hw/atapi/cmds/cmd_mode_sense_10.cpp @@ -26,11 +26,11 @@ // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. References are prefixed by // the letter in brackets as listed above. -#include "vixen/hw/atapi/cmds/cmd_mode_sense_10.h" +#include "strikebox/hw/atapi/cmds/cmd_mode_sense_10.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/atapi/cmds/cmd_read_10.cpp b/modules/core/src/common/strikebox/hw/atapi/cmds/cmd_read_10.cpp similarity index 97% rename from modules/core/src/common/vixen/hw/atapi/cmds/cmd_read_10.cpp rename to modules/core/src/common/strikebox/hw/atapi/cmds/cmd_read_10.cpp index eea1f06..9c9fac9 100644 --- a/modules/core/src/common/vixen/hw/atapi/cmds/cmd_read_10.cpp +++ b/modules/core/src/common/strikebox/hw/atapi/cmds/cmd_read_10.cpp @@ -26,11 +26,11 @@ // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. References are prefixed by // the letter in brackets as listed above. -#include "vixen/hw/atapi/cmds/cmd_read_10.h" +#include "strikebox/hw/atapi/cmds/cmd_read_10.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/atapi/cmds/cmd_read_capacity.cpp b/modules/core/src/common/strikebox/hw/atapi/cmds/cmd_read_capacity.cpp similarity index 95% rename from modules/core/src/common/vixen/hw/atapi/cmds/cmd_read_capacity.cpp rename to modules/core/src/common/strikebox/hw/atapi/cmds/cmd_read_capacity.cpp index 0dcaf9d..8ce2c53 100644 --- a/modules/core/src/common/vixen/hw/atapi/cmds/cmd_read_capacity.cpp +++ b/modules/core/src/common/strikebox/hw/atapi/cmds/cmd_read_capacity.cpp @@ -26,11 +26,11 @@ // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. References are prefixed by // the letter in brackets as listed above. -#include "vixen/hw/atapi/cmds/cmd_read_capacity.h" +#include "strikebox/hw/atapi/cmds/cmd_read_capacity.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/atapi/cmds/cmd_read_dvd_structure.cpp b/modules/core/src/common/strikebox/hw/atapi/cmds/cmd_read_dvd_structure.cpp similarity index 97% rename from modules/core/src/common/vixen/hw/atapi/cmds/cmd_read_dvd_structure.cpp rename to modules/core/src/common/strikebox/hw/atapi/cmds/cmd_read_dvd_structure.cpp index 43de076..0521713 100644 --- a/modules/core/src/common/vixen/hw/atapi/cmds/cmd_read_dvd_structure.cpp +++ b/modules/core/src/common/strikebox/hw/atapi/cmds/cmd_read_dvd_structure.cpp @@ -26,11 +26,11 @@ // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. References are prefixed by // the letter in brackets as listed above. -#include "vixen/hw/atapi/cmds/cmd_read_dvd_structure.h" +#include "strikebox/hw/atapi/cmds/cmd_read_dvd_structure.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/atapi/cmds/cmd_test_unit_ready.cpp b/modules/core/src/common/strikebox/hw/atapi/cmds/cmd_test_unit_ready.cpp similarity index 95% rename from modules/core/src/common/vixen/hw/atapi/cmds/cmd_test_unit_ready.cpp rename to modules/core/src/common/strikebox/hw/atapi/cmds/cmd_test_unit_ready.cpp index a23c3da..b1b9dcb 100644 --- a/modules/core/src/common/vixen/hw/atapi/cmds/cmd_test_unit_ready.cpp +++ b/modules/core/src/common/strikebox/hw/atapi/cmds/cmd_test_unit_ready.cpp @@ -26,11 +26,11 @@ // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. References are prefixed by // the letter in brackets as listed above. -#include "vixen/hw/atapi/cmds/cmd_test_unit_ready.h" +#include "strikebox/hw/atapi/cmds/cmd_test_unit_ready.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/atapi/cmds/proto_data_in.cpp b/modules/core/src/common/strikebox/hw/atapi/cmds/proto_data_in.cpp similarity index 95% rename from modules/core/src/common/vixen/hw/atapi/cmds/proto_data_in.cpp rename to modules/core/src/common/strikebox/hw/atapi/cmds/proto_data_in.cpp index 96e79e2..1639c9c 100644 --- a/modules/core/src/common/vixen/hw/atapi/cmds/proto_data_in.cpp +++ b/modules/core/src/common/strikebox/hw/atapi/cmds/proto_data_in.cpp @@ -26,11 +26,11 @@ // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. References are prefixed by // the letter in brackets as listed above. -#include "vixen/hw/atapi/cmds/proto_data_in.h" +#include "strikebox/hw/atapi/cmds/proto_data_in.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { namespace cmd { diff --git a/modules/core/src/common/vixen/hw/atapi/cmds/proto_nondata.cpp b/modules/core/src/common/strikebox/hw/atapi/cmds/proto_nondata.cpp similarity index 93% rename from modules/core/src/common/vixen/hw/atapi/cmds/proto_nondata.cpp rename to modules/core/src/common/strikebox/hw/atapi/cmds/proto_nondata.cpp index 3b03aa1..6145a8f 100644 --- a/modules/core/src/common/vixen/hw/atapi/cmds/proto_nondata.cpp +++ b/modules/core/src/common/strikebox/hw/atapi/cmds/proto_nondata.cpp @@ -26,11 +26,11 @@ // References to particular items in the specification are denoted between brackets // optionally followed by a quote from the specification. References are prefixed by // the letter in brackets as listed above. -#include "vixen/hw/atapi/cmds/proto_nondata.h" +#include "strikebox/hw/atapi/cmds/proto_nondata.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { namespace hw { namespace atapi { namespace cmd { diff --git a/modules/core/src/common/strikebox/hw/basic/char.cpp b/modules/core/src/common/strikebox/hw/basic/char.cpp new file mode 100644 index 0000000..54b5899 --- /dev/null +++ b/modules/core/src/common/strikebox/hw/basic/char.cpp @@ -0,0 +1,7 @@ +#include "strikebox/hw/basic/char.h" + +namespace strikebox { + + + +} diff --git a/modules/core/src/common/vixen/hw/basic/char_null.cpp b/modules/core/src/common/strikebox/hw/basic/char_null.cpp similarity index 89% rename from modules/core/src/common/vixen/hw/basic/char_null.cpp rename to modules/core/src/common/strikebox/hw/basic/char_null.cpp index 8ddd2dc..2b3a28e 100644 --- a/modules/core/src/common/vixen/hw/basic/char_null.cpp +++ b/modules/core/src/common/strikebox/hw/basic/char_null.cpp @@ -1,6 +1,6 @@ -#include "vixen/hw/basic/char_null.h" +#include "strikebox/hw/basic/char_null.h" -namespace vixen { +namespace strikebox { bool NullCharDriver::Init() { // Nothing to initialize diff --git a/modules/core/src/common/vixen/hw/basic/cmos.cpp b/modules/core/src/common/strikebox/hw/basic/cmos.cpp similarity index 98% rename from modules/core/src/common/vixen/hw/basic/cmos.cpp rename to modules/core/src/common/strikebox/hw/basic/cmos.cpp index d04e195..8cf35f4 100644 --- a/modules/core/src/common/vixen/hw/basic/cmos.cpp +++ b/modules/core/src/common/strikebox/hw/basic/cmos.cpp @@ -1,9 +1,9 @@ -#include "vixen/hw/basic/cmos.h" +#include "strikebox/hw/basic/cmos.h" -#include "vixen/log.h" -#include "vixen/io.h" +#include "strikebox/log.h" +#include "strikebox/io.h" -namespace vixen { +namespace strikebox { static inline bool IsRTCRegister(uint8_t reg) { switch (reg) { diff --git a/modules/core/src/common/vixen/hw/basic/gsi.cpp b/modules/core/src/common/strikebox/hw/basic/gsi.cpp similarity index 83% rename from modules/core/src/common/vixen/hw/basic/gsi.cpp rename to modules/core/src/common/strikebox/hw/basic/gsi.cpp index 1cddbe2..9bb664f 100644 --- a/modules/core/src/common/vixen/hw/basic/gsi.cpp +++ b/modules/core/src/common/strikebox/hw/basic/gsi.cpp @@ -1,6 +1,6 @@ -#include "vixen/hw/basic/gsi.h" +#include "strikebox/hw/basic/gsi.h" -namespace vixen { +namespace strikebox { void GSI::HandleIRQ(uint8_t irqNum, bool level) { if (irqNum < ISA_NUM_IRQS) { diff --git a/modules/core/src/common/vixen/hw/basic/i8254.cpp b/modules/core/src/common/strikebox/hw/basic/i8254.cpp similarity index 97% rename from modules/core/src/common/vixen/hw/basic/i8254.cpp rename to modules/core/src/common/strikebox/hw/basic/i8254.cpp index 13b5233..8bf1990 100644 --- a/modules/core/src/common/vixen/hw/basic/i8254.cpp +++ b/modules/core/src/common/strikebox/hw/basic/i8254.cpp @@ -25,11 +25,11 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "vixen/hw/basic/i8254.h" +#include "strikebox/hw/basic/i8254.h" -#include "vixen/thread.h" +#include "strikebox/thread.h" -namespace vixen { +namespace strikebox { // TODO: Refer to QEMU if we ever need to complete this implementation: // https://github.com/qemu/qemu/blob/master/hw/timer/i8254_common.c diff --git a/modules/core/src/common/vixen/hw/basic/i8259.cpp b/modules/core/src/common/strikebox/hw/basic/i8259.cpp similarity index 99% rename from modules/core/src/common/vixen/hw/basic/i8259.cpp rename to modules/core/src/common/strikebox/hw/basic/i8259.cpp index d230f86..79fd170 100644 --- a/modules/core/src/common/vixen/hw/basic/i8259.cpp +++ b/modules/core/src/common/strikebox/hw/basic/i8259.cpp @@ -25,12 +25,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "vixen/hw/basic/i8259.h" +#include "strikebox/hw/basic/i8259.h" -#include "vixen/log.h" -#include "vixen/io.h" +#include "strikebox/log.h" +#include "strikebox/io.h" -namespace vixen { +namespace strikebox { // Implementation based on QEMU: // https://github.com/qemu/qemu/blob/master/hw/intc/i8259_common.c diff --git a/modules/core/src/common/vixen/hw/basic/irq.cpp b/modules/core/src/common/strikebox/hw/basic/irq.cpp similarity index 79% rename from modules/core/src/common/vixen/hw/basic/irq.cpp rename to modules/core/src/common/strikebox/hw/basic/irq.cpp index 00b918e..73c3653 100644 --- a/modules/core/src/common/vixen/hw/basic/irq.cpp +++ b/modules/core/src/common/strikebox/hw/basic/irq.cpp @@ -1,6 +1,6 @@ -#include "vixen/hw/basic/irq.h" +#include "strikebox/hw/basic/irq.h" -namespace vixen { +namespace strikebox { IRQ *AllocateIRQs(IRQHandler *handler, uint8_t numIRQs) { IRQ *irqs = new IRQ[numIRQs]; diff --git a/modules/core/src/common/vixen/hw/basic/mcpx.cpp b/modules/core/src/common/strikebox/hw/basic/mcpx.cpp similarity index 84% rename from modules/core/src/common/vixen/hw/basic/mcpx.cpp rename to modules/core/src/common/strikebox/hw/basic/mcpx.cpp index 4112a21..d60c132 100644 --- a/modules/core/src/common/vixen/hw/basic/mcpx.cpp +++ b/modules/core/src/common/strikebox/hw/basic/mcpx.cpp @@ -1,8 +1,8 @@ -#include "vixen/hw/basic/mcpx.h" +#include "strikebox/hw/basic/mcpx.h" -#include "vixen/hw/defs.h" +#include "strikebox/hw/defs.h" -namespace vixen { +namespace strikebox { MCPXRevision MCPXRevisionFromHardwareModel(HardwareModel hardwareModel) { switch (hardwareModel) { diff --git a/modules/core/src/common/vixen/hw/basic/serial.cpp b/modules/core/src/common/strikebox/hw/basic/serial.cpp similarity index 99% rename from modules/core/src/common/vixen/hw/basic/serial.cpp rename to modules/core/src/common/strikebox/hw/basic/serial.cpp index beedca5..2f3b6dd 100644 --- a/modules/core/src/common/vixen/hw/basic/serial.cpp +++ b/modules/core/src/common/strikebox/hw/basic/serial.cpp @@ -26,12 +26,12 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "vixen/hw/basic/serial.h" +#include "strikebox/hw/basic/serial.h" -#include "vixen/log.h" -#include "vixen/io.h" +#include "strikebox/log.h" +#include "strikebox/io.h" -namespace vixen { +namespace strikebox { #define UART_LCR_DLAB 0x80 /* Divisor latch access bit */ diff --git a/modules/core/src/common/vixen/hw/basic/superio.cpp b/modules/core/src/common/strikebox/hw/basic/superio.cpp similarity index 97% rename from modules/core/src/common/vixen/hw/basic/superio.cpp rename to modules/core/src/common/strikebox/hw/basic/superio.cpp index 634b089..5704ba9 100644 --- a/modules/core/src/common/vixen/hw/basic/superio.cpp +++ b/modules/core/src/common/strikebox/hw/basic/superio.cpp @@ -20,12 +20,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ -#include "vixen/hw/basic/superio.h" +#include "strikebox/hw/basic/superio.h" -#include "vixen/log.h" -#include "vixen/io.h" +#include "strikebox/log.h" +#include "strikebox/io.h" -namespace vixen { +namespace strikebox { const static uint32_t kSerialPortIOBases[] = { PORT_SERIAL_BASE_1, diff --git a/modules/core/src/common/vixen/hw/bus/isabus.cpp b/modules/core/src/common/strikebox/hw/bus/isabus.cpp similarity index 93% rename from modules/core/src/common/vixen/hw/bus/isabus.cpp rename to modules/core/src/common/strikebox/hw/bus/isabus.cpp index 8649d20..7cb7298 100644 --- a/modules/core/src/common/vixen/hw/bus/isabus.cpp +++ b/modules/core/src/common/strikebox/hw/bus/isabus.cpp @@ -20,11 +20,11 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, see . */ -#include "vixen/hw/bus/isabus.h" +#include "strikebox/hw/bus/isabus.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { ISABus::ISABus(IRQ *irqs) : m_irqs(irqs) diff --git a/modules/core/src/common/vixen/hw/bus/pcibus.cpp b/modules/core/src/common/strikebox/hw/bus/pcibus.cpp similarity index 98% rename from modules/core/src/common/vixen/hw/bus/pcibus.cpp rename to modules/core/src/common/strikebox/hw/bus/pcibus.cpp index e29df14..1a5e724 100644 --- a/modules/core/src/common/vixen/hw/bus/pcibus.cpp +++ b/modules/core/src/common/strikebox/hw/bus/pcibus.cpp @@ -25,13 +25,13 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "vixen/hw/bus/pcibus.h" +#include "strikebox/hw/bus/pcibus.h" -#include "vixen/log.h" +#include "strikebox/log.h" #include -namespace vixen { +namespace strikebox { PCIBus::PCIBus() { m_owner = nullptr; diff --git a/modules/core/src/common/vixen/hw/bus/smbus.cpp b/modules/core/src/common/strikebox/hw/bus/smbus.cpp similarity index 98% rename from modules/core/src/common/vixen/hw/bus/smbus.cpp rename to modules/core/src/common/strikebox/hw/bus/smbus.cpp index c09d26b..0b50075 100644 --- a/modules/core/src/common/vixen/hw/bus/smbus.cpp +++ b/modules/core/src/common/strikebox/hw/bus/smbus.cpp @@ -25,11 +25,11 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ -#include "vixen/hw/bus/smbus.h" +#include "strikebox/hw/bus/smbus.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { SMBus::SMBus(IRQ *irq) : PCIDevice(PCI_HEADER_TYPE_MULTIFUNCTION, PCI_VENDOR_ID_NVIDIA, 0x01B4, 0xB1, diff --git a/modules/core/src/common/vixen/hw/ohci/ohci.cpp b/modules/core/src/common/strikebox/hw/ohci/ohci.cpp similarity index 99% rename from modules/core/src/common/vixen/hw/ohci/ohci.cpp rename to modules/core/src/common/strikebox/hw/ohci/ohci.cpp index 01d8874..ab72328 100644 --- a/modules/core/src/common/vixen/hw/ohci/ohci.cpp +++ b/modules/core/src/common/strikebox/hw/ohci/ohci.cpp @@ -34,16 +34,16 @@ // * // ****************************************************************** -#include "vixen/hw/ohci/ohci.h" +#include "strikebox/hw/ohci/ohci.h" -#include "vixen/log.h" +#include "strikebox/log.h" #include //#define DEBUG_PACKET //#define DEBUG_ISOCH -namespace vixen { +namespace strikebox { #define ONE_KB 1024 #define ONE_MB (1024 * 1024) @@ -461,7 +461,7 @@ bool OHCI::OHCI_CopyTD(OHCI_TD* Td, uint8_t* Buffer, int Length, bool bIsWrite) return false; // no bytes left to copy } - // From the standard: "If during the data transfer the buffer address contained in the HCfs working copy of + // From the standard: "If during the data transfer the buffer address contained in the HC's working copy of // CurrentBufferPointer crosses a 4K boundary, the upper 20 bits of BufferEnd are copied to the // working value of CurrentBufferPointer causing the next buffer address to be the 0th byte in the // same 4K page that contains the last byte of the buffer." diff --git a/modules/core/src/common/vixen/hw/ohci/ohci_hub.cpp b/modules/core/src/common/strikebox/hw/ohci/ohci_hub.cpp similarity index 99% rename from modules/core/src/common/vixen/hw/ohci/ohci_hub.cpp rename to modules/core/src/common/strikebox/hw/ohci/ohci_hub.cpp index 6dd76f0..49b911b 100644 --- a/modules/core/src/common/vixen/hw/ohci/ohci_hub.cpp +++ b/modules/core/src/common/strikebox/hw/ohci/ohci_hub.cpp @@ -40,12 +40,12 @@ #include -#include "vixen/hw/ohci/ohci.h" -#include "vixen/hw/ohci/ohci_hub.h" +#include "strikebox/hw/ohci/ohci.h" +#include "strikebox/hw/ohci/ohci_hub.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { Hub* g_HubObjArray[4] = { nullptr }; diff --git a/modules/core/src/common/vixen/hw/pci/ac97.cpp b/modules/core/src/common/strikebox/hw/pci/ac97.cpp similarity index 95% rename from modules/core/src/common/vixen/hw/pci/ac97.cpp rename to modules/core/src/common/strikebox/hw/pci/ac97.cpp index ebc200e..2e5903c 100644 --- a/modules/core/src/common/vixen/hw/pci/ac97.cpp +++ b/modules/core/src/common/strikebox/hw/pci/ac97.cpp @@ -1,8 +1,8 @@ -#include "vixen/hw/pci/ac97.h" +#include "strikebox/hw/pci/ac97.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { AC97Device::AC97Device() : PCIDevice(PCI_HEADER_TYPE_NORMAL, PCI_VENDOR_ID_NVIDIA, 0x01B1, 0xB1, diff --git a/modules/core/src/common/vixen/hw/pci/agpbridge.cpp b/modules/core/src/common/strikebox/hw/pci/agpbridge.cpp similarity index 95% rename from modules/core/src/common/vixen/hw/pci/agpbridge.cpp rename to modules/core/src/common/strikebox/hw/pci/agpbridge.cpp index 8d88d2d..f3414dd 100644 --- a/modules/core/src/common/vixen/hw/pci/agpbridge.cpp +++ b/modules/core/src/common/strikebox/hw/pci/agpbridge.cpp @@ -1,8 +1,8 @@ -#include "vixen/hw/pci/agpbridge.h" +#include "strikebox/hw/pci/agpbridge.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { AGPBridgeDevice::AGPBridgeDevice() : PCIBridgeDevice(PCI_VENDOR_ID_NVIDIA, 0x01B7, 0xA1) diff --git a/modules/core/src/common/vixen/hw/pci/bmide.cpp b/modules/core/src/common/strikebox/hw/pci/bmide.cpp similarity index 97% rename from modules/core/src/common/vixen/hw/pci/bmide.cpp rename to modules/core/src/common/strikebox/hw/pci/bmide.cpp index d2920f7..a9b8393 100644 --- a/modules/core/src/common/vixen/hw/pci/bmide.cpp +++ b/modules/core/src/common/strikebox/hw/pci/bmide.cpp @@ -5,12 +5,12 @@ // Revision 1.0 available at http://www.bswd.com/idems100.pdf // and complemented with information from PC87415 at // https://parisc.wiki.kernel.org/images-parisc/0/0a/PC87415.pdf -#include "vixen/hw/pci/bmide.h" +#include "strikebox/hw/pci/bmide.h" -#include "vixen/log.h" -#include "vixen/thread.h" +#include "strikebox/log.h" +#include "strikebox/thread.h" -namespace vixen { +namespace strikebox { namespace hw { namespace bmide { diff --git a/modules/core/src/common/vixen/hw/pci/bmide_channel.cpp b/modules/core/src/common/strikebox/hw/pci/bmide_channel.cpp similarity index 98% rename from modules/core/src/common/vixen/hw/pci/bmide_channel.cpp rename to modules/core/src/common/strikebox/hw/pci/bmide_channel.cpp index 336a620..ae4a088 100644 --- a/modules/core/src/common/vixen/hw/pci/bmide_channel.cpp +++ b/modules/core/src/common/strikebox/hw/pci/bmide_channel.cpp @@ -5,12 +5,12 @@ // Revision 1.0 available at http://www.bswd.com/idems100.pdf // and complemented with information from PC87415 at // https://parisc.wiki.kernel.org/images-parisc/0/0a/PC87415.pdf -#include "vixen/hw/pci/bmide.h" +#include "strikebox/hw/pci/bmide.h" -#include "vixen/log.h" -#include "vixen/thread.h" +#include "strikebox/log.h" +#include "strikebox/thread.h" -namespace vixen { +namespace strikebox { namespace hw { namespace bmide { diff --git a/modules/core/src/common/vixen/hw/pci/hostbridge.cpp b/modules/core/src/common/strikebox/hw/pci/hostbridge.cpp similarity index 96% rename from modules/core/src/common/vixen/hw/pci/hostbridge.cpp rename to modules/core/src/common/strikebox/hw/pci/hostbridge.cpp index 42cf33c..b1042c8 100644 --- a/modules/core/src/common/vixen/hw/pci/hostbridge.cpp +++ b/modules/core/src/common/strikebox/hw/pci/hostbridge.cpp @@ -1,8 +1,8 @@ -#include "vixen/hw/pci/hostbridge.h" +#include "strikebox/hw/pci/hostbridge.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { HostBridgeDevice::HostBridgeDevice() : PCIDevice(PCI_HEADER_TYPE_MULTIFUNCTION, PCI_VENDOR_ID_NVIDIA, 0x02A5, 0xA1, diff --git a/modules/core/src/common/vixen/hw/pci/lpc.cpp b/modules/core/src/common/strikebox/hw/pci/lpc.cpp similarity index 98% rename from modules/core/src/common/vixen/hw/pci/lpc.cpp rename to modules/core/src/common/strikebox/hw/pci/lpc.cpp index 88b2979..5d55697 100644 --- a/modules/core/src/common/vixen/hw/pci/lpc.cpp +++ b/modules/core/src/common/strikebox/hw/pci/lpc.cpp @@ -20,14 +20,14 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ -#include "vixen/hw/pci/lpc.h" +#include "strikebox/hw/pci/lpc.h" -#include "vixen/log.h" -#include "vixen/mem.h" +#include "strikebox/log.h" +#include "strikebox/mem.h" #include -namespace vixen { +namespace strikebox { LPCDevice::LPCDevice(IRQ *irqs, uint8_t *rom, uint8_t *bios, uint32_t biosSize, uint8_t *mcpxROM, bool initMcpxROM) : PCIDevice(PCI_HEADER_TYPE_MULTIFUNCTION, PCI_VENDOR_ID_NVIDIA, 0x01B2, 0xB2, diff --git a/modules/core/src/common/vixen/hw/pci/mcpx_ram.cpp b/modules/core/src/common/strikebox/hw/pci/mcpx_ram.cpp similarity index 86% rename from modules/core/src/common/vixen/hw/pci/mcpx_ram.cpp rename to modules/core/src/common/strikebox/hw/pci/mcpx_ram.cpp index 0541b2b..6908c5e 100644 --- a/modules/core/src/common/vixen/hw/pci/mcpx_ram.cpp +++ b/modules/core/src/common/strikebox/hw/pci/mcpx_ram.cpp @@ -1,8 +1,8 @@ -#include "vixen/hw/pci/mcpx_ram.h" +#include "strikebox/hw/pci/mcpx_ram.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { MCPXRAMDevice::MCPXRAMDevice(MCPXRevision revision) : PCIDevice(PCI_HEADER_TYPE_MULTIFUNCTION, PCI_VENDOR_ID_NVIDIA, 0x02A6, 0xA1, diff --git a/modules/core/src/common/vixen/hw/pci/nv2a.cpp b/modules/core/src/common/strikebox/hw/pci/nv2a.cpp similarity index 99% rename from modules/core/src/common/vixen/hw/pci/nv2a.cpp rename to modules/core/src/common/strikebox/hw/pci/nv2a.cpp index 5f3d5cb..67a7b54 100644 --- a/modules/core/src/common/vixen/hw/pci/nv2a.cpp +++ b/modules/core/src/common/strikebox/hw/pci/nv2a.cpp @@ -23,10 +23,10 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ -#include "vixen/hw/pci/nv2a.h" +#include "strikebox/hw/pci/nv2a.h" -#include "vixen/log.h" -#include "vixen/thread.h" +#include "strikebox/log.h" +#include "strikebox/thread.h" #include #include @@ -42,7 +42,7 @@ static inline int ffs(int i) { } #endif -namespace vixen { +namespace strikebox { #define GET_MASK(v, mask) (((v) & (mask)) >> (ffs(mask)-1)) diff --git a/modules/core/src/common/vixen/hw/pci/nvapu.cpp b/modules/core/src/common/strikebox/hw/pci/nvapu.cpp similarity index 98% rename from modules/core/src/common/vixen/hw/pci/nvapu.cpp rename to modules/core/src/common/strikebox/hw/pci/nvapu.cpp index d192438..21f3fe7 100644 --- a/modules/core/src/common/vixen/hw/pci/nvapu.cpp +++ b/modules/core/src/common/strikebox/hw/pci/nvapu.cpp @@ -38,11 +38,11 @@ // * // ****************************************************************** -#include "vixen/hw/pci/nvapu.h" +#include "strikebox/hw/pci/nvapu.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { uint32_t GetAPUTime() { // This timer counts at 48000 Hz diff --git a/modules/core/src/common/vixen/hw/pci/nvnet.cpp b/modules/core/src/common/strikebox/hw/pci/nvnet.cpp similarity index 99% rename from modules/core/src/common/vixen/hw/pci/nvnet.cpp rename to modules/core/src/common/strikebox/hw/pci/nvnet.cpp index a7673df..4c3b732 100644 --- a/modules/core/src/common/vixen/hw/pci/nvnet.cpp +++ b/modules/core/src/common/strikebox/hw/pci/nvnet.cpp @@ -21,11 +21,11 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ -#include "vixen/hw/pci/nvnet.h" +#include "strikebox/hw/pci/nvnet.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { // NVNET Register Definitions // Taken from XQEMU diff --git a/modules/core/src/common/vixen/hw/pci/pci.cpp b/modules/core/src/common/strikebox/hw/pci/pci.cpp similarity index 98% rename from modules/core/src/common/vixen/hw/pci/pci.cpp rename to modules/core/src/common/strikebox/hw/pci/pci.cpp index 67e9435..2908d0a 100644 --- a/modules/core/src/common/vixen/hw/pci/pci.cpp +++ b/modules/core/src/common/strikebox/hw/pci/pci.cpp @@ -25,14 +25,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "vixen/hw/pci/pci.h" +#include "strikebox/hw/pci/pci.h" -#include "vixen/hw/bus/pcibus.h" -#include "vixen/log.h" +#include "strikebox/hw/bus/pcibus.h" +#include "strikebox/log.h" #include -namespace vixen { +namespace strikebox { PCIDevice::PCIDevice(uint8_t type, uint16_t vendorID, uint16_t deviceID, uint8_t revisionID, uint8_t classID, uint8_t subclass, uint8_t progIF, diff --git a/modules/core/src/common/vixen/hw/pci/pci_irq.cpp b/modules/core/src/common/strikebox/hw/pci/pci_irq.cpp similarity index 82% rename from modules/core/src/common/vixen/hw/pci/pci_irq.cpp rename to modules/core/src/common/strikebox/hw/pci/pci_irq.cpp index f17366d..c456912 100644 --- a/modules/core/src/common/vixen/hw/pci/pci_irq.cpp +++ b/modules/core/src/common/strikebox/hw/pci/pci_irq.cpp @@ -1,6 +1,6 @@ -#include "vixen/hw/pci/pci_irq.h" +#include "strikebox/hw/pci/pci_irq.h" -namespace vixen { +namespace strikebox { uint8_t DefaultIRQMapper::MapIRQ(PCIDevice *dev, uint8_t irqNum) { return (irqNum + dev->GetPCIAddress().deviceNumber) % PCI_NUM_PINS; diff --git a/modules/core/src/common/vixen/hw/pci/pcibridge.cpp b/modules/core/src/common/strikebox/hw/pci/pcibridge.cpp similarity index 97% rename from modules/core/src/common/vixen/hw/pci/pcibridge.cpp rename to modules/core/src/common/strikebox/hw/pci/pcibridge.cpp index 643d7c2..b1e7846 100644 --- a/modules/core/src/common/vixen/hw/pci/pcibridge.cpp +++ b/modules/core/src/common/strikebox/hw/pci/pcibridge.cpp @@ -32,12 +32,12 @@ * Copyright (c) 2010 Isaku Yamahata * VA Linux Systems Japan K.K. */ -#include "vixen/hw/pci/pcibridge.h" +#include "strikebox/hw/pci/pcibridge.h" -#include "vixen/log.h" -#include "vixen/hw/utils.h" +#include "strikebox/log.h" +#include "strikebox/hw/utils.h" -namespace vixen { +namespace strikebox { PCIBridgeDevice::PCIBridgeDevice() : PCIBridgeDevice(PCI_VENDOR_ID_NVIDIA, 0x01B8, 0xB1) diff --git a/modules/core/src/common/vixen/hw/pci/usb_pci.cpp b/modules/core/src/common/strikebox/hw/pci/usb_pci.cpp similarity index 99% rename from modules/core/src/common/vixen/hw/pci/usb_pci.cpp rename to modules/core/src/common/strikebox/hw/pci/usb_pci.cpp index dafeb5a..e237993 100644 --- a/modules/core/src/common/vixen/hw/pci/usb_pci.cpp +++ b/modules/core/src/common/strikebox/hw/pci/usb_pci.cpp @@ -42,12 +42,12 @@ #include #include -#include "vixen/log.h" +#include "strikebox/log.h" -#include "vixen/hw/pci/usb_pci.h" -#include "vixen/hw/ohci/ohci.h" +#include "strikebox/hw/pci/usb_pci.h" +#include "strikebox/hw/ohci/ohci.h" -namespace vixen { +namespace strikebox { #define SETUP_STATE_IDLE 0 #define SETUP_STATE_SETUP 1 diff --git a/modules/core/src/common/vixen/hw/sm/adm1032.cpp b/modules/core/src/common/strikebox/hw/sm/adm1032.cpp similarity index 94% rename from modules/core/src/common/vixen/hw/sm/adm1032.cpp rename to modules/core/src/common/strikebox/hw/sm/adm1032.cpp index 6203637..7fe049f 100644 --- a/modules/core/src/common/vixen/hw/sm/adm1032.cpp +++ b/modules/core/src/common/strikebox/hw/sm/adm1032.cpp @@ -1,9 +1,9 @@ // (C) Ivan "StrikerX3" Oliveira // // Datasheet: https://www.onsemi.com/pub/Collateral/ADM1032-D.PDF -#include "vixen/hw/sm/adm1032.h" +#include "strikebox/hw/sm/adm1032.h" -namespace vixen { +namespace strikebox { ADM1032Device::~ADM1032Device() { } diff --git a/modules/core/src/common/vixen/hw/sm/eeprom.cpp b/modules/core/src/common/strikebox/hw/sm/eeprom.cpp similarity index 94% rename from modules/core/src/common/vixen/hw/sm/eeprom.cpp rename to modules/core/src/common/strikebox/hw/sm/eeprom.cpp index 38760ec..1e9ec79 100644 --- a/modules/core/src/common/vixen/hw/sm/eeprom.cpp +++ b/modules/core/src/common/strikebox/hw/sm/eeprom.cpp @@ -1,8 +1,8 @@ -#include "vixen/hw/sm/eeprom.h" +#include "strikebox/hw/sm/eeprom.h" #include -namespace vixen { +namespace strikebox { EEPROMDevice::~EEPROMDevice() { } diff --git a/modules/core/src/common/strikebox/hw/sm/sm.cpp b/modules/core/src/common/strikebox/hw/sm/sm.cpp new file mode 100644 index 0000000..0dbb6f7 --- /dev/null +++ b/modules/core/src/common/strikebox/hw/sm/sm.cpp @@ -0,0 +1,7 @@ +#include "strikebox/hw/sm/sm.h" + +namespace strikebox { + + + +} diff --git a/modules/core/src/common/vixen/hw/sm/smc.cpp b/modules/core/src/common/strikebox/hw/sm/smc.cpp similarity index 98% rename from modules/core/src/common/vixen/hw/sm/smc.cpp rename to modules/core/src/common/strikebox/hw/sm/smc.cpp index 623f93f..1534d3d 100644 --- a/modules/core/src/common/vixen/hw/sm/smc.cpp +++ b/modules/core/src/common/strikebox/hw/sm/smc.cpp @@ -20,12 +20,12 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ -#include "vixen/hw/sm/smc.h" -#include "vixen/hw/sm/led.h" +#include "strikebox/hw/sm/smc.h" +#include "strikebox/hw/sm/led.h" -#include "vixen/log.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { SMCRevision SMCRevisionFromHardwareModel(HardwareModel hardwareModel) { switch (hardwareModel) { diff --git a/modules/core/src/common/vixen/hw/sm/tvenc.cpp b/modules/core/src/common/strikebox/hw/sm/tvenc.cpp similarity index 92% rename from modules/core/src/common/vixen/hw/sm/tvenc.cpp rename to modules/core/src/common/strikebox/hw/sm/tvenc.cpp index fc904cb..0d4b8ce 100644 --- a/modules/core/src/common/vixen/hw/sm/tvenc.cpp +++ b/modules/core/src/common/strikebox/hw/sm/tvenc.cpp @@ -1,6 +1,6 @@ -#include "vixen/hw/sm/tvenc.h" +#include "strikebox/hw/sm/tvenc.h" -namespace vixen { +namespace strikebox { TVEncoder TVEncoderFromHardwareModel(HardwareModel hardwareModel) { switch (hardwareModel) { diff --git a/modules/core/src/common/vixen/hw/sm/tvenc_conexant.cpp b/modules/core/src/common/strikebox/hw/sm/tvenc_conexant.cpp similarity index 94% rename from modules/core/src/common/vixen/hw/sm/tvenc_conexant.cpp rename to modules/core/src/common/strikebox/hw/sm/tvenc_conexant.cpp index 5b45ab6..b903c7f 100644 --- a/modules/core/src/common/vixen/hw/sm/tvenc_conexant.cpp +++ b/modules/core/src/common/strikebox/hw/sm/tvenc_conexant.cpp @@ -1,6 +1,6 @@ -#include "vixen/hw/sm/tvenc_conexant.h" +#include "strikebox/hw/sm/tvenc_conexant.h" -namespace vixen { +namespace strikebox { // This is just a completely fake device that doesn't respond to anything. // Its mere presence is enough to satisfy the X-codes initialization process. diff --git a/modules/core/src/common/vixen/hw/xid/xid_gamepad.cpp b/modules/core/src/common/strikebox/hw/xid/xid_gamepad.cpp similarity index 99% rename from modules/core/src/common/vixen/hw/xid/xid_gamepad.cpp rename to modules/core/src/common/strikebox/hw/xid/xid_gamepad.cpp index 1f9f004..869276c 100644 --- a/modules/core/src/common/vixen/hw/xid/xid_gamepad.cpp +++ b/modules/core/src/common/strikebox/hw/xid/xid_gamepad.cpp @@ -38,14 +38,14 @@ // * // ****************************************************************** -#include "vixen/hw/xid/xid_gamepad.h" +#include "strikebox/hw/xid/xid_gamepad.h" -#include "vixen/hw/ohci/ohci.h" -#include "vixen/hw/pci/usb_pci.h" +#include "strikebox/hw/ohci/ohci.h" +#include "strikebox/hw/pci/usb_pci.h" #include -namespace vixen { +namespace strikebox { XidGamepad* g_XidControllerObjArray[4]; diff --git a/modules/core/src/common/vixen/io.cpp b/modules/core/src/common/strikebox/io.cpp similarity index 98% rename from modules/core/src/common/vixen/io.cpp rename to modules/core/src/common/strikebox/io.cpp index e29d622..a916ed9 100644 --- a/modules/core/src/common/vixen/io.cpp +++ b/modules/core/src/common/strikebox/io.cpp @@ -1,7 +1,7 @@ -#include "vixen/io.h" -#include "vixen/log.h" +#include "strikebox/io.h" +#include "strikebox/log.h" -namespace vixen { +namespace strikebox { // ----- Default I/O device implementation ------------------------------------ diff --git a/modules/core/src/common/vixen/iovec.cpp b/modules/core/src/common/strikebox/iovec.cpp similarity index 98% rename from modules/core/src/common/vixen/iovec.cpp rename to modules/core/src/common/strikebox/iovec.cpp index a9330bc..03eee85 100644 --- a/modules/core/src/common/vixen/iovec.cpp +++ b/modules/core/src/common/strikebox/iovec.cpp @@ -35,7 +35,7 @@ // * All rights reserved // * // ****************************************************************** -#include "vixen/iovec.h" +#include "strikebox/iovec.h" #include #include @@ -45,7 +45,7 @@ #define MIN(a, b) (((a) < (b)) ? (a) : (b)) #endif -namespace vixen { +namespace strikebox { void IoVecReset(IOVector* qiov) { assert(qiov->AllocNumber != -1); diff --git a/modules/core/src/common/vixen/log.cpp b/modules/core/src/common/strikebox/log.cpp similarity index 85% rename from modules/core/src/common/vixen/log.cpp rename to modules/core/src/common/strikebox/log.cpp index 3f0546b..60078fc 100644 --- a/modules/core/src/common/vixen/log.cpp +++ b/modules/core/src/common/strikebox/log.cpp @@ -1,8 +1,8 @@ -#include "vixen/log.h" +#include "strikebox/log.h" #include -namespace vixen { +namespace strikebox { /*! * Print a message to the log diff --git a/modules/core/src/common/vixen/timer.cpp b/modules/core/src/common/strikebox/timer.cpp similarity index 90% rename from modules/core/src/common/vixen/timer.cpp rename to modules/core/src/common/strikebox/timer.cpp index 84cc6c6..ccea6b1 100644 --- a/modules/core/src/common/vixen/timer.cpp +++ b/modules/core/src/common/strikebox/timer.cpp @@ -1,8 +1,8 @@ -#include "vixen/timer.h" +#include "strikebox/timer.h" #include -namespace vixen { +namespace strikebox { /*! * Constructor diff --git a/modules/core/src/common/strikebox/util/fifo.cpp b/modules/core/src/common/strikebox/util/fifo.cpp new file mode 100644 index 0000000..b64eaa2 --- /dev/null +++ b/modules/core/src/common/strikebox/util/fifo.cpp @@ -0,0 +1,7 @@ +#include "strikebox/util/fifo.h" + +namespace strikebox { + + + +} diff --git a/modules/core/src/common/vixen/util/invoke_later.cpp b/modules/core/src/common/strikebox/util/invoke_later.cpp similarity index 96% rename from modules/core/src/common/vixen/util/invoke_later.cpp rename to modules/core/src/common/strikebox/util/invoke_later.cpp index 7a5394b..06cb489 100644 --- a/modules/core/src/common/vixen/util/invoke_later.cpp +++ b/modules/core/src/common/strikebox/util/invoke_later.cpp @@ -1,8 +1,8 @@ -#include "vixen/util/invoke_later.h" +#include "strikebox/util/invoke_later.h" #include -namespace vixen { +namespace strikebox { void InvokeLaterThreadFunc(void *data) { ((InvokeLater *)data)->Run(); diff --git a/modules/core/src/common/vixen/xbox.cpp b/modules/core/src/common/strikebox/xbox.cpp similarity index 98% rename from modules/core/src/common/vixen/xbox.cpp rename to modules/core/src/common/strikebox/xbox.cpp index d68464c..7c32a45 100644 --- a/modules/core/src/common/vixen/xbox.cpp +++ b/modules/core/src/common/strikebox/xbox.cpp @@ -1,23 +1,23 @@ -#include "vixen/xbox.h" -#include "vixen/timer.h" -#include "vixen/alloc.h" -#include "vixen/debug.h" -#include "vixen/settings.h" +#include "strikebox/xbox.h" +#include "strikebox/timer.h" +#include "strikebox/alloc.h" +#include "strikebox/debug.h" +#include "strikebox/settings.h" -#include "vixen/hw/defs.h" -#include "vixen/hw/sm/tvenc.h" -#include "vixen/hw/sm/tvenc_conexant.h" +#include "strikebox/hw/defs.h" +#include "strikebox/hw/sm/tvenc.h" +#include "strikebox/hw/sm/tvenc_conexant.h" -#include "vixen/hw/basic/char_null.h" +#include "strikebox/hw/basic/char_null.h" #ifdef _WIN32 -#include "vixen/hw/basic/win32/char_serial.h" +#include "strikebox/hw/basic/win32/char_serial.h" #endif -#include "vixen/hw/ata/drvs/drv_vhd_dummy.h" -#include "vixen/hw/ata/drvs/drv_vhd_image.h" +#include "strikebox/hw/ata/drvs/drv_vhd_dummy.h" +#include "strikebox/hw/ata/drvs/drv_vhd_image.h" -#include "vixen/hw/ata/drvs/drv_vdvd_dummy.h" -#include "vixen/hw/ata/drvs/drv_vdvd_image.h" +#include "strikebox/hw/ata/drvs/drv_vdvd_dummy.h" +#include "strikebox/hw/ata/drvs/drv_vdvd_image.h" #ifdef __linux__ #include @@ -27,7 +27,7 @@ #include -namespace vixen { +namespace strikebox { using namespace virt86; @@ -174,7 +174,7 @@ Xbox::~Xbox() { if (m_GSI != nullptr) delete m_GSI; } -void Xbox::CopySettings(viXenSettings *settings) { +void Xbox::CopySettings(StrikeBoxSettings *settings) { m_settings = *settings; } diff --git a/modules/core/src/common/vixen/hw/basic/char.cpp b/modules/core/src/common/vixen/hw/basic/char.cpp deleted file mode 100644 index 9ec18d2..0000000 --- a/modules/core/src/common/vixen/hw/basic/char.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "vixen/hw/basic/char.h" - -namespace vixen { - - - -} diff --git a/modules/core/src/common/vixen/hw/sm/sm.cpp b/modules/core/src/common/vixen/hw/sm/sm.cpp deleted file mode 100644 index 127baf1..0000000 --- a/modules/core/src/common/vixen/hw/sm/sm.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "vixen/hw/sm/sm.h" - -namespace vixen { - - - -} diff --git a/modules/core/src/common/vixen/util/fifo.cpp b/modules/core/src/common/vixen/util/fifo.cpp deleted file mode 100644 index f9feb8a..0000000 --- a/modules/core/src/common/vixen/util/fifo.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "vixen/util/fifo.h" - -namespace vixen { - - - -} diff --git a/modules/core/src/linux/thread.cpp b/modules/core/src/linux/thread.cpp index 1f4a422..612bc1a 100644 --- a/modules/core/src/linux/thread.cpp +++ b/modules/core/src/linux/thread.cpp @@ -1,15 +1,11 @@ -#if defined(__linux__) || defined(LINUX) - -#include "vixen/thread.h" +#include "strikebox/thread.h" #include -namespace vixen { +namespace strikebox { void Thread_SetName(const char *threadName) { pthread_setname_np(pthread_self(), threadName); } } - -#endif // LINUX diff --git a/modules/core/src/windows/vixen/hw/basic/win32/char_serial.cpp b/modules/core/src/windows/strikebox/hw/basic/win32/char_serial.cpp similarity index 98% rename from modules/core/src/windows/vixen/hw/basic/win32/char_serial.cpp rename to modules/core/src/windows/strikebox/hw/basic/win32/char_serial.cpp index 09009b5..42810e9 100644 --- a/modules/core/src/windows/vixen/hw/basic/win32/char_serial.cpp +++ b/modules/core/src/windows/strikebox/hw/basic/win32/char_serial.cpp @@ -1,8 +1,6 @@ -#ifdef _WIN32 - #include "char_serial.h" -namespace vixen { +namespace strikebox { #define NSENDBUF 2048 #define NRECVBUF 2048 @@ -135,5 +133,3 @@ void Win32SerialDriver::CommEvent(SerialCommEvent evt) { } } - -#endif // _WIN32 diff --git a/modules/core/src/windows/vixen/hw/basic/win32/char_serial.h b/modules/core/src/windows/strikebox/hw/basic/win32/char_serial.h similarity index 88% rename from modules/core/src/windows/vixen/hw/basic/win32/char_serial.h rename to modules/core/src/windows/strikebox/hw/basic/win32/char_serial.h index 3284c53..3191331 100644 --- a/modules/core/src/windows/vixen/hw/basic/win32/char_serial.h +++ b/modules/core/src/windows/strikebox/hw/basic/win32/char_serial.h @@ -1,12 +1,12 @@ #pragma once -#include "vixen/hw/basic/char.h" -#include "vixen/thread.h" +#include "strikebox/hw/basic/char.h" +#include "strikebox/thread.h" #include "mt_serial.h" #include -namespace vixen { +namespace strikebox { class Win32SerialDriver : public CharDriver { public: diff --git a/modules/core/src/windows/vixen/hw/basic/win32/mt_serial.cpp b/modules/core/src/windows/strikebox/hw/basic/win32/mt_serial.cpp similarity index 99% rename from modules/core/src/windows/vixen/hw/basic/win32/mt_serial.cpp rename to modules/core/src/windows/strikebox/hw/basic/win32/mt_serial.cpp index 9355029..ce0c4ec 100644 --- a/modules/core/src/windows/vixen/hw/basic/win32/mt_serial.cpp +++ b/modules/core/src/windows/strikebox/hw/basic/win32/mt_serial.cpp @@ -1,13 +1,11 @@ -#ifdef _WIN32 - #include "mt_serial.h" #include #include -#include "vixen/thread.h" +#include "strikebox/thread.h" -namespace vixen { +namespace strikebox { #define WRITE_QUEUE_SIZE 4096 @@ -690,5 +688,3 @@ void SerialComm::WriterLoop() { } } - -#endif // _WIN32 diff --git a/modules/core/src/windows/vixen/hw/basic/win32/mt_serial.h b/modules/core/src/windows/strikebox/hw/basic/win32/mt_serial.h similarity index 99% rename from modules/core/src/windows/vixen/hw/basic/win32/mt_serial.h rename to modules/core/src/windows/strikebox/hw/basic/win32/mt_serial.h index fc178e3..f5ffece 100644 --- a/modules/core/src/windows/vixen/hw/basic/win32/mt_serial.h +++ b/modules/core/src/windows/strikebox/hw/basic/win32/mt_serial.h @@ -5,7 +5,7 @@ #include #include -namespace vixen { +namespace strikebox { enum SerialCommParity { Parity_None, diff --git a/modules/core/src/windows/thread.cpp b/modules/core/src/windows/thread.cpp index b3bf18f..d340b3a 100644 --- a/modules/core/src/windows/thread.cpp +++ b/modules/core/src/windows/thread.cpp @@ -1,10 +1,8 @@ -#ifdef _WIN32 - -#include "vixen/thread.h" +#include "strikebox/thread.h" #include -namespace vixen { +namespace strikebox { const DWORD MS_VC_EXCEPTION = 0x406D1388; @@ -32,5 +30,3 @@ void Thread_SetName(const char *threadName) { } } - -#endif // _WIN32