Remove the ComplexBitMap
This commit is contained in:
@@ -7,19 +7,19 @@
|
||||
namespace JabyEngine {
|
||||
namespace CD {
|
||||
namespace internal {
|
||||
struct Mode : public ComplexBitMap<uint8_t> {
|
||||
static constexpr auto DoubleSpeed = Bit<uint8_t>(7);
|
||||
__declare_io_type(Mode, uint8_t,
|
||||
static constexpr auto DoubleSpeed = Bit(7);
|
||||
static constexpr auto SingleSpeed = !DoubleSpeed;
|
||||
static constexpr auto XADPCM = Bit<uint8_t>(6);
|
||||
static constexpr auto WholeSector = Bit<uint8_t>(5);
|
||||
static constexpr auto XADPCM = Bit(6);
|
||||
static constexpr auto WholeSector = Bit(5);
|
||||
static constexpr auto DataSector = !WholeSector;
|
||||
static constexpr auto UseXAFilter = Bit<uint8_t>(3);
|
||||
static constexpr auto AudioPlayIRQ = Bit<uint8_t>(2);
|
||||
static constexpr auto AutoPauseTrack = Bit<uint8_t>(1);
|
||||
static constexpr auto CDDA = Bit<uint8_t>(0);
|
||||
};
|
||||
static constexpr auto UseXAFilter = Bit(3);
|
||||
static constexpr auto AudioPlayIRQ = Bit(2);
|
||||
static constexpr auto AutoPauseTrack = Bit(1);
|
||||
static constexpr auto CDDA = Bit(0);
|
||||
);
|
||||
|
||||
static constexpr auto DataSectorMode = Mode::with(Mode::DoubleSpeed, Mode::DataSector);
|
||||
static constexpr auto DataSectorMode = Mode_t::from(Mode_t::DoubleSpeed, Mode_t::DataSector);
|
||||
|
||||
static SectorBufferAllocator sector_allocator;
|
||||
static uint16_t sectors_left;
|
||||
|
@@ -10,7 +10,7 @@ namespace JabyEngine {
|
||||
void start() {
|
||||
NextRoutine next_routine = JabyEngine::NextRoutine::from(boot::Start::setup);
|
||||
|
||||
printf("Starting Planschbecken 0x%p\n", next_routine.value);
|
||||
printf("Starting Planschbecken Version 0 0x%p\n", next_routine.value);
|
||||
while(true) {
|
||||
if(next_routine.is_null()) {
|
||||
break;
|
||||
|
Reference in New Issue
Block a user