bfsmacklib: Moved MSSSMACKTIMERREAD(), and changed implementation

The Smacker library is not supposed to directly use SDL. Bullfrog
Library should do that (though for timer the bflibrary currently
does not use SDL either).

bfsmacklib/include/smack2ail.h

@@ -32,6 +32,11 @@ extern "C" {
 
 /******************************************************************************/
 
+/** Link Smacker audio output to AIL library interface.
+ *
+ * @param speed Frequency of the timer sending buffers to AIL output.
+ * @param digdrv Digital Audio Driver instance from the AIL library.
+ */
 uint8_t RADAPI SMACKSOUNDUSEMSS(uint32_t speed, void *digdrv);
 
 /******************************************************************************/

bfsmacklib/src/smack2ail.c

@@ -20,6 +20,7 @@
 #include "smack2ail.h"
 
 #include <stddef.h>
+#include "bftime.h"
 /******************************************************************************/
 extern void *SmackMSSDigDriver;
 extern uint32_t MSSSpeed;
@@ -43,11 +44,15 @@ void RADAPI MSSLOWSOUNDCLOSE(SmackSndTrk *sstrk);
 uint32_t RADAPI MSSLOWSOUNDPLAYED(SmackSndTrk *sstrk);
 void RADAPI MSSLOWSOUNDPURGE(SmackSndTrk *sstrk);
 void RADAPI MSSSMACKTIMERSETUP(void);
-uint32_t RADAPI MSSSMACKTIMERREAD(void);
 void RADAPI MSSSMACKTIMERDONE(void);
 void RADAPI MSSLOWSOUNDCHECK(void);
 void RADAPI MSSLOWSOUNDVOLPAN(uint32_t pan, uint32_t volume, SmackSndTrk *sstrk);
 
+uint32_t RADAPI MSSSMACKTIMERREAD(void)
+{
+    return LbTimerClock();
+}
+
 uint8_t RADAPI SMACKSOUNDUSEMSS(uint32_t speed, void *digdrv)
 {
 #if 1

src/bflib_snd_mss_s.sx

@@ -153,7 +153,7 @@ GLOBAL_FUNC (MSSSMACKTIMERSETUP)
 
 
 /*----------------------------------------------------------------*/
-MSSSMACKTIMERREAD:
+ASM_MSSSMACKTIMERREAD:
 /*----------------------------------------------------------------*/
 		push   %esi
 		push   %edi

src/timer.c

@@ -11,9 +11,3 @@ timer_get_18_2_hz_ticks (void)
 {
   return (((uint64_t) SDL_GetTicks () * 1193182 / 1000) >> 15);
 }
-
-uint32_t
-MSSSMACKTIMERREAD (void)
-{
-  return SDL_GetTicks ();
-}