Adds improvements found in 240p test suite

.travis.yml

@@ -14,4 +14,5 @@ install:
 script:
   - docker pull anacierdem/libdragon:toolchain
   - docker run --name=libdragon -d --mount type=bind,source=$(pwd),target=/libdragon -w=/libdragon anacierdem/libdragon:toolchain tail -f /dev/null
-  - docker exec libdragon /bin/bash ./build.sh
+  - docker exec libdragon /bin/bash ./build.sh
+

CHANGELOG.md

@@ -13,4 +13,4 @@
 ## [1.3.9] - 2019-27-10
 ### Added
 
-- Add texture mirroring. https://github.com/DragonMinded/libdragon/commit/00a6cc8e6d136cf2578a50320f6ff0814dfb6657
+- Add texture mirroring. https://github.com/DragonMinded/libdragon/commit/00a6cc8e6d136cf2578a50320f6ff0814dfb6657

Makefile

@@ -80,7 +80,7 @@ install: libdragon.a libdragonsys.a
 	install -m 0644 libdragonsys.a $(INSTALLDIR)/mips64-elf/lib/libdragonsys.a
 
 	install -m 0644 n64.ld $(INSTALLDIR)/mips64-elf/lib/n64.ld
-	install -m 0644 header $(INSTALLDIR)/mips64-elf/lib/header
+	install -m 0644 headers/header $(INSTALLDIR)/mips64-elf/lib/header
 
 clean:
 	rm -f *.o *.a

azure-pipelines.yml

@@ -66,8 +66,12 @@ jobs:
 
       mkdir -p $BUILD_ARTIFACTSTAGINGDIRECTORY/lib/
       cp "$BUILD_SOURCESDIRECTORY/"*.a "$BUILD_ARTIFACTSTAGINGDIRECTORY/lib/"
-      cp "$BUILD_SOURCESDIRECTORY/"*.ld "$BUILD_ARTIFACTSTAGINGDIRECTORY/lib/"
-      cp "$BUILD_SOURCESDIRECTORY/header" "$BUILD_ARTIFACTSTAGINGDIRECTORY/lib/"
+
+      mkdir -p $BUILD_ARTIFACTSTAGINGDIRECTORY/ldscripts/
+      cp "$BUILD_SOURCESDIRECTORY/"*.ld "$BUILD_ARTIFACTSTAGINGDIRECTORY/ldscripts/"
+
+      mkdir -p $BUILD_ARTIFACTSTAGINGDIRECTORY/headers/
+      cp "$BUILD_SOURCESDIRECTORY/headers/"* "$BUILD_ARTIFACTSTAGINGDIRECTORY/headers/"
     displayName: 'Move Artifacts to Staging Directory'
     continueOnError: false
 

build.sh

@@ -11,4 +11,4 @@ make -j8 && \
 make install && \
 popd && \
 rm -rf /tmp/libmikmod && \
-make -j8 examples
+make -j8 examples

examples/dfsdemo/dfsdemo.c

@@ -411,4 +411,3 @@ int main(void)
 
     return 0;
 }
-

examples/ucodetest/Makefile

@@ -48,4 +48,4 @@ basic.o: loader.S text.section.bin data.section.bin
 clean:
 	rm -f *.v64 *.z64 *.elf *.o *.bin
 
-.PHONY : clean
+.PHONY : clean

examples/ucodetest/basic.S

@@ -15,4 +15,4 @@ deadloop:
 
 .data
 var1: .word 0xDEADBEEF
-var2: .word 0xBEEFF00D
+var2: .word 0xBEEFF00D

examples/ucodetest/loader.S

@@ -14,4 +14,4 @@ __basic_ucode_start:
 
 .balign 8
 .global __basic_ucode_end
-__basic_ucode_end:
+__basic_ucode_end:

include/audio.h

@@ -25,6 +25,8 @@ extern "C" {
  */
 typedef void(*audio_fill_buffer_callback)(short *buffer, size_t numsamples);
 
+void audio_init_ex(const int frequency, int numbuffers, int maxsamples, void (*cb)());
+
 void audio_init(const int frequency, int numbuffers);
 void audio_set_buffer_callback(audio_fill_buffer_callback fill_buffer_callback);
 void audio_pause(bool pause);
@@ -34,6 +36,9 @@ void audio_write_silence();
 void audio_close();
 int audio_get_frequency();
 int audio_get_buffer_length();
+void audio_set_num_samples(int numsamples);
+short *audio_get_next_buffer(int *lastbuf);
+volatile int audio_send_buffer(int lastbuf);
 
 #ifdef __cplusplus
 }

include/controller.h

@@ -14,7 +14,7 @@
 /**
  * @name Bitmasks for controller status
  * @see #get_controllers_present
- * @see #get_accessories_present    
+ * @see #get_accessories_present
  * @{
  */
 /** @brief Controller 1 Inserted */
@@ -44,6 +44,21 @@
 #define ACCESSORY_TRANSFERPAK    4
 /** @} */
 
+/**
+ * @name Controller ID Values
+ * @see #identify_controller
+ * @{
+ */
+/** @brief No controller present */
+#define CONTROLLER_NONE         0xFF
+/** @brief Mouse present */
+#define CONTROLLER_MOUSE        2
+/** @brief Keyboard present */
+#define CONTROLLER_KEYBOARD     4 // ?? fixme!
+/** @brief Digital pad present */
+#define CONTROLLER_PAD          5
+/** @} */
+
 /**
  * @name SI Error Values
  * @{
@@ -192,6 +207,7 @@ int get_dpad_direction( int controller );
 int read_mempak_address( int controller, uint16_t address, uint8_t *data );
 int write_mempak_address( int controller, uint16_t address, uint8_t *data );
 int identify_accessory( int controller );
+int identify_controller( int controller );
 void rumble_start( int controller );
 void rumble_stop( int controller );
 void execute_raw_command( int controller, int command, int bytesout, int bytesin, unsigned char *out, unsigned char *in );

include/display.h

@@ -13,6 +13,19 @@
  * @{
  */
 
+/**
+ * @brief Valid television types
+ */
+typedef enum
+{
+    /** @brief PAL */
+    TV_TYPE_PAL,
+    /** @brief NTSC */
+    TV_TYPE_NTSC,
+    /** @brief MPAL */
+    TV_TYPE_MPAL
+} tvtype_t;
+
 /**
  * @brief Valid video resolutions
  */
@@ -29,7 +42,7 @@ typedef enum
     /** @brief 512x240 mode, high-res progressive */
     RESOLUTION_512x240,
     /** @brief 640x240 mode, high-res progressive */
-    RESOLUTION_640x240,
+    RESOLUTION_640x240
 } resolution_t;
 
 /** @brief Valid bit depths */
@@ -38,7 +51,9 @@ typedef enum
     /** @brief 16 bits per pixel (5-5-5-1) */
     DEPTH_16_BPP,
     /** @brief 32 bits per pixel (8-8-8-8) */
-    DEPTH_32_BPP
+    DEPTH_32_BPP,
+    /** @brief 16 bits per pixel (5-5-5-1) with HW Dither */
+    DEPTH_16_BPP_DITHER
 } bitdepth_t;
 
 /** @brief Valid gamma correction settings */
@@ -62,7 +77,13 @@ typedef enum
     /** @brief Anti-aliasing and resampling with fetch-on-need */
     ANTIALIAS_RESAMPLE_FETCH_NEEDED,
     /** @brief Anti-aliasing and resampling with fetch-always */
-    ANTIALIAS_RESAMPLE_FETCH_ALWAYS
+    ANTIALIAS_RESAMPLE_FETCH_ALWAYS,
+    /** @brief Resampling anti-aliasing Divot off */
+    ANTIALIAS_RESAMPLE_NODIVOT,
+    /** @brief Anti-aliasing and resampling with fetch-on-need Divot off */
+    ANTIALIAS_RESAMPLE_FETCH_NEEDED_NODIVOT,
+    /** @brief Anti-aliasing and resampling with fetch-always Divot off */
+    ANTIALIAS_RESAMPLE_FETCH_ALWAYS_NODIVOT
 } antialias_t;
 
 /** @brief Display context */
@@ -73,6 +94,7 @@ extern "C" {
 #endif
 
 void display_init( resolution_t res, bitdepth_t bit, uint32_t num_buffers, gamma_t gamma, antialias_t aa );
+void display_init_ex( tvtype_t tv, resolution_t res, bitdepth_t bit, uint32_t num_buffers, gamma_t gamma, antialias_t aa );
 display_context_t display_lock();
 void display_show(display_context_t disp);
 void display_close();