Make interrupts work when OS is on

include/ace/managers/blit.h

@@ -73,7 +73,7 @@ void blitManagerDestroy(void);
 /**
  * @brief Checks if blitter is idle.
  *
- * Polls 2 times, taing A1000 Agnus bug workaround into account.
+ * Polls 2 times, taking A1000 Agnus bug workaround into account.
  *
  * @return 1 if blitter is idle, otherwise 0.
  *
@@ -84,6 +84,8 @@ UBYTE blitIsIdle(void);
 /**
  * @brief Waits until blitter finishes its work.
  *
+ * Polls at least 2 times, taking A1000 Agnus bug workaround into account.
+ *
  * @todo Investigate if autosetting BLITHOG inside it is beneficial.
  *
  * @see blitIsIdle()

include/ace/managers/bob.h

@@ -245,6 +245,15 @@ void bobEnd(void);
 
 void bobDiscardUndraw(void);
 
+/**
+ * @brief Sets the current buffer to given bitmap in case it loses sync.
+ * Usually used in tandem with bobDiscardUndraw() when bob system was disabled
+ * for some time.
+ *
+ * @param pCurrent Current buffer to use. Must be same as one of passed
+ * in bobManagerCreate().
+ */
+void bobSetCurrentBuffer(tBitMap *pCurrent);
 
 #ifdef __cplusplus
 }

include/ace/managers/ptplayer.h

@@ -65,6 +65,7 @@ typedef struct tPtplayerSamplePack {
 } tPtplayerSamplePack;
 
 typedef void (*tPtplayerCbSongEnd)(void);
+typedef void (*tPtplayerCbE8)(UBYTE ubE8);
 
 /**
  * @brief Install a CIA-B interrupt for calling _mt_music or mt_sfxonly.
@@ -346,6 +347,14 @@ tPtplayerSamplePack *ptplayerSampleDataCreateFromFd(tFile *pFileSamples);
  */
 void ptplayerSamplePackDestroy(tPtplayerSamplePack *pSamplePack);
 
+/**
+ * @brief Sets the function to call on parsing the E8 command.
+ *
+ * @param cbOnE8 Function to be called. E8 argument nibble is passed
+ * as argument. Set to zero if not needed.
+ */
+void ptplayerSetE8Callback(tPtplayerCbE8 cbOnE8);
+
 #ifdef __cplusplus
 }
 #endif

include/ace/managers/system.h

@@ -21,6 +21,8 @@ typedef void (*tAceIntHandler)(
 	REGARG(volatile tCustom *pCustom, "a0"), REGARG(volatile void *pData, "a1")
 );
 
+typedef void (*tKeyInputHandler)(UBYTE ubRawKeyCode);
+
 //-------------------------------------------------------------------- FUNCTIONS
 
 /**
@@ -54,10 +56,12 @@ UBYTE systemBlitterIsUsed(void);
 
 void systemDump(void);
 
+void systemSetKeyInputHandler(tKeyInputHandler cbKeyInputHandler);
+
 void systemSetInt(UBYTE ubIntNumber, tAceIntHandler pHandler, void *pIntData);
 
 void systemSetCiaInt(
-	UBYTE ubCia, UBYTE ubIntBit, tAceIntHandler pHandler, void *pIntData
+	UBYTE ubCia, UBYTE ubIntBit, tAceIntHandler cbHandler, void *pIntData
 );
 
 void systemSetCiaCr(UBYTE ubCia, UBYTE isCrB, UBYTE ubCrValue);

include/ace/types.h

@@ -52,24 +52,6 @@ typedef int32_t LONG;
 #define FN_HOTSPOT
 #define FN_COLDSPOT
 #define BITFIELD_STRUCT struct __attribute__((packed))
-#elif defined(__VBCC__)
-#if defined(CONFIG_SYSTEM_OS_FRIENDLY)
-#define INTERRUPT __amigainterrupt __saveds
-#define INTERRUPT_END do {} while(0)
-#elif defined(CONFIG_SYSTEM_OS_TAKEOVER)
-#define INTERRUPT
-#define INTERRUPT_END do {} while(0)
-#endif
-
-#define HWINTERRUPT __interrupt __saveds
-#define UNUSED_ARG
-#define REGARG(arg, reg) __reg(reg) arg
-#define CHIP __chip
-#define FAR
-#define INTERRUPT_END do {} while(0)
-#define FN_HOTSPOT
-#define FN_COLDSPOT
-#define BITFIELD_STRUCT struct
 #elif defined(BARTMAN_GCC)
 #define INTERRUPT
 #define INTERRUPT_END do {} while(0)

include/ace/utils/palette.h

@@ -26,6 +26,14 @@ extern "C" {
  */
 void paletteLoadFromPath(const char *szPath, UWORD *pPalette, UBYTE ubMaxLength);
 
+/**
+ * @brief Saves given palette into .plt file.
+ * @param pPalette Palette to save.
+ * @param ubColorCnt Number of colors in palette.
+ * @param szPath Destination path.
+ */
+void paletteSave(UWORD *pPalette, UBYTE ubColorCnt, char *szPath);
+
 /**
  * @brief Loads palette from supplied .plt file to given address.
  * @param pFile Handle to the palette file. Will be closed on function return.
@@ -62,9 +70,23 @@ void paletteDim(
  * @brief Dims a single input color to given brightness level.
  * @param uwFullColor Full color used as a base to calculate percentage.
  * @param ubLevel Brightness level - 15 for no dim, 0 for total blackness.
+ *
+ * @see paletteColorMix()
  */
 UWORD paletteColorDim(UWORD uwFullColor, UBYTE ubLevel);
 
+/**
+ * @brief Interpolates two colors at given level.
+ * @param uwColorPrimary Primary color in the mix.
+ * @param uwColorSecondary Secondary color in the mix.
+ * @param ubLevel Mix ratio - 15 results in primary color, 0 in secondary.
+ * @return Mixed color between uwColorPrimary and uwColorSecondary.
+ *
+ * @note This function is slower than paletteColorDim().
+ * @see paletteColorDim()
+ */
+UWORD paletteColorMix(UWORD uwColorPrimary, UWORD uwColorSecondary, UBYTE ubLevel);
+
 /**
  * @brief Writes given palette to debug .bmp file.
  *

src/ace/managers/blit.c

@@ -101,20 +101,20 @@ UBYTE _blitCheck(
 #endif // defined(ACE_DEBUG)
 
 void blitWait(void) {
-	while(!blitIsIdle()) continue;
+	// A1000 Blitter done bug:
+	// The solution is to read hardware register before testing the bit.
+	(void)g_pCustom->dmaconr;
+	while(g_pCustom->dmaconr & DMAF_BLTDONE) continue;
 }
 
-/**
- * Checks if blitter is idle
- * Polls 2 times - A1000 Agnus bug workaround
- */
 UBYTE blitIsIdle(void) {
-	if(!(g_pCustom->dmaconr & DMAF_BLTDONE)) {
-		if(!(g_pCustom->dmaconr & DMAF_BLTDONE)) {
-			return 1;
-		}
+	// A1000 Blitter done bug:
+	// The solution is to read hardware register before testing the bit.
+	(void)g_pCustom->dmaconr;
+	if(g_pCustom->dmaconr & DMAF_BLTDONE) {
+		return 0;
 	}
-	return 0;
+	return 1;
 }
 
 UBYTE blitUnsafeCopy(

src/ace/managers/bob.c

@@ -208,6 +208,10 @@ void bobInit(
 	tBob *pBob, UWORD uwWidth, UWORD uwHeight, UBYTE isUndrawRequired,
 	UBYTE *pFrameData, UBYTE *pMaskData, UWORD uwX, UWORD uwY
 ) {
+	logBlockBegin(
+		"bobInit(pBob: %p, uwWidth: %hu, uwHeight: %hu, isUndrawRequired: %hhu, pFrameData: %p, pMaskData: %p, uwX: %hu, uwY: %hu)",
+		pBob, uwWidth, uwHeight, isUndrawRequired, pFrameData, pMaskData, uwX, uwY
+	);
 #if defined(ACE_DEBUG)
 	pBob->_uwOriginalWidth = uwWidth;
 	pBob->_uwOriginalHeight = uwHeight;
@@ -238,7 +242,7 @@ void bobInit(
 	}
 #endif
 	++s_ubMaxBobCount;
-	// logWrite("Added bob, now max: %hhu\n", s_ubMaxBobCount);
+	logBlockEnd("bobInit()");
 }
 
 void bobSetFrame(tBob *pBob, UBYTE *pFrameData, UBYTE *pMaskData) {
@@ -279,6 +283,9 @@ void bobSetHeight(tBob *pBob, UWORD uwHeight)
 }
 
 UBYTE *bobCalcFrameAddress(tBitMap *pBitmap, UWORD uwOffsetY) {
+	if(uwOffsetY >= pBitmap->Rows) {
+		logWrite("ERR: bobCalcFrameAddress() OffsY %hu > bitmap height: %hu", uwOffsetY, pBitmap->Rows);
+	}
 	return &pBitmap->Planes[0][pBitmap->BytesPerRow * uwOffsetY];
 }
 
@@ -550,3 +557,9 @@ void bobDiscardUndraw(void) {
 	s_pQueues[0].ubUndrawCount = 0;
 	s_pQueues[1].ubUndrawCount = 0;
 }
+
+void bobSetCurrentBuffer(tBitMap *pCurrent) {
+	if(s_pQueues[!s_ubBufferCurr].pDst == pCurrent) {
+		s_ubBufferCurr = !s_ubBufferCurr;
+	}
+}

src/ace/managers/key.c

@@ -8,7 +8,8 @@
 #include <ace/managers/system.h>
 #include <ace/utils/custom.h>
 #include <hardware/intbits.h> // INTB_PORTS
-#define KEY_RELEASED_BIT 1
+#define KEY_INTERRUPT_RELEASED_BIT 1
+#define KEY_INPUT_HANDLER_RELEASED_MASK BV(7)
 
 #if defined ACE_DEBUG
 static UBYTE s_bInitCount = 0;
@@ -35,13 +36,19 @@ void keySetState(UBYTE ubKeyCode, UBYTE ubKeyState) {
 	keyIntSetState(&g_sKeyManager, ubKeyCode, ubKeyState);
 }
 
+void onRawKeyInput(UBYTE ubRawKey) {
+	UBYTE isKeyReleased = ubRawKey & KEY_INPUT_HANDLER_RELEASED_MASK;
+	ubRawKey &= ~KEY_INPUT_HANDLER_RELEASED_MASK;
+	keySetState(ubRawKey, isKeyReleased ? KEY_NACTIVE : KEY_ACTIVE);
+}
+
 /**
  * Key interrupt server
  * Gets key press/release from kbd controller and confirms reception
  * by handshake
  */
 FN_HOTSPOT
-void INTERRUPT keyIntServer(
+void INTERRUPT onKeyInterrupt(
 	REGARG(volatile tCustom *pCustom, "a0"),
 	REGARG(volatile void *pData, "a1")
 ) {
@@ -54,7 +61,7 @@ void INTERRUPT keyIntServer(
 	UWORD uwStart = pRayPos->bfPosY;
 
 	// Get keypress flag and shift key code
-	UBYTE ubKeyReleased = ubKeyCode & KEY_RELEASED_BIT;
+	UBYTE ubKeyReleased = ubKeyCode & KEY_INTERRUPT_RELEASED_BIT;
 	ubKeyCode >>= 1;
 	keyIntSetState(
 		pKeyManager, ubKeyCode, ubKeyReleased ? KEY_NACTIVE : KEY_ACTIVE
@@ -99,7 +106,8 @@ void keyCreate(void) {
 		logWrite("ERR: Keyboard already initialized\n");
 	}
 #endif
-	systemSetCiaInt(CIA_A, CIAICRB_SERIAL, keyIntServer, &g_sKeyManager);
+	systemSetCiaInt(CIA_A, CIAICRB_SERIAL, onKeyInterrupt, &g_sKeyManager);
+	systemSetKeyInputHandler(onRawKeyInput);
 	logBlockEnd("keyCreate()");
 }
 
@@ -112,6 +120,7 @@ void keyDestroy(void) {
 	}
 #endif
 	systemSetCiaInt(CIA_A, CIAICRB_SERIAL, 0, 0);
+	systemSetKeyInputHandler(0);
 	logBlockEnd("keyDestroy()");
 }