Skip to content

Conversation

@ChetSimpson
Copy link
Contributor

This is the first iteration of reorganizing the directories and namespaces in libcommon and includes the following changes.

  • Moved beckerport from vcc/devices/becker to vcc/devices/serial.
  • Moved FileOps from vcc/common to vcc/utils.
  • Moved logger from vcc/common to vcc/utils.
  • Renamed vcc/core to vcc/bus.
  • Moved vcc/cartridges into vcc/bus.

The resulting directory structure is as follows

|   |-- bus/
|   |   |-- cartridges/
|   |   |   |-- capi_adapter_cartridge
|   |   |   |-- empty_cartridge
|   |   |   `-- rom_cartridge
|   |   |-- cartridge
|   |   |-- cartridge_capi
|   |   |-- cartridge_context
|   |   |-- cartridge_factory
|   |   `-- interrupts
|   |-- common/
|   |   |-- DialogOps
|   |-- detail/
|   |   |-- exports
|   |-- devices/
|   |   |-- rom/
|   |   |   |-- banked_rom_image
|   |   |   `-- rom_image
|   |   |-- rtc/
|   |   |   |-- ds1315
|   |   |   `-- oki_m6242b
|   |   |-- serial/
|   |   |   `-- becker
|   |-- utils/
|   |   |-- cartridge_loader
|   |   |-- critical_section
|   |   |-- dll_deleter
|   |   |-- FileOps
|   |   |-- filesystem
|   |   |-- logger
|   |   |-- handle_deleter
|   |   |-- persistent_value_store
|   |   '-- winapi```


@ejaquay ejaquay merged commit 8555604 into VCCE:main Nov 10, 2025
1 check passed
@ejaquay
Copy link
Contributor

ejaquay commented Nov 10, 2025

After the merge I get:

|-- include
|   `-- vcc
|       |-- bus
|       |   |-- cartridge.h
|       |   |-- cartridge_capi.h
|       |   |-- cartridge_context.h
|       |   |-- cartridge_factory.h
|       |   |-- cartridges
|       |   |   |-- capi_adapter_cartridge.h
|       |   |   |-- empty_cartridge.h
|       |   |   `-- rom_cartridge.h
|       |   `-- interrupts.h
|       |-- common
|       |   `-- DialogOps.h
|       |-- detail
|       |   `-- exports.h
|       |-- devices
|       |   |-- rom
|       |   |   |-- banked_rom_image.h
|       |   |   `-- rom_image.h
|       |   |-- rtc
|       |   |   |-- ds1315.h
|       |   |   `-- oki_m6242b.h
|       |   `-- serial
|       |       `-- beckerport.h
|       `-- utils
|           |-- FileOps.h
|           |-- cartridge_loader.h
|           |-- critical_section.h
|           |-- dll_deleter.h
|           |-- filesystem.h
|           |-- logger.h
|           |-- persistent_value_store.h
|           `-- winapi.h
|-- libcommon.vcxproj
|-- libcommon.vcxproj.filters
|-- resource
|   |-- libcommon.rc
|   `-- resource.h
`-- src
    |-- DialogOps.cpp
    |-- bus
    |   |-- cartridge.cpp
    |   `-- cartridges
    |       |-- capi_adapter_cartridge.cpp
    |       |-- empty_cartridge.cpp
    |       `-- rom_cartridge.cpp
    |-- devices
    |   |-- rom
    |   |   |-- banked_rom_image.cpp
    |   |   `-- rom_image.cpp
    |   |-- rtc
    |   |   |-- ds1315.cpp
    |   |   `-- oki_m6242b.cpp
    |   `-- serial
    |       `-- beckerport.cpp
    |-- main.cpp
    `-- utils
        |-- Fileops.cpp
        |-- cartridge_loader.cpp
        |-- filesystem.cpp
        |-- logger.cpp
        |-- persistent_value_store.cpp
        `-- winapi.cpp

@ChetSimpson ChetSimpson deleted the cs/libcommon/reorg branch November 13, 2025 12:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants