summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/arm/nds/libnds
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2009-11-29 14:53:02 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2009-11-29 14:53:02 +0000
commit32b8506b2409a01d434dd0ab5024c7718852ebcb (patch)
tree24b3215851217bf05c40cc8a62af4d021019b5d1 /c/src/lib/libbsp/arm/nds/libnds
parentWhitespace removal. (diff)
downloadrtems-32b8506b2409a01d434dd0ab5024c7718852ebcb.tar.bz2
Whitespace removal.
Diffstat (limited to 'c/src/lib/libbsp/arm/nds/libnds')
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/basicARM7/source/defaultARM7.c6
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/audio.h8
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/clock.h10
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/boxtest.h10
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/cache.h2
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/console.h8
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/image.h144
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/input.h49
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/math.h142
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/ndsmotion.h8
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/pcx.h152
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/postest.h4
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/rumble.h148
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/sound.h144
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/sprite.h20
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/trig_lut.h144
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/video.h2
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/videoGL.h224
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/card.h4
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/interrupts.h4
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/registers_alt.h2
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/reload.h36
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/system.h4
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/include/nds/timers.h32
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/source/arm7/clock.c14
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/source/arm7/touch.c2
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/source/arm7/userSettings.c12
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/source/arm9/boxtest.c2
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/source/arm9/console.c18
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/source/arm9/gurumeditation.c2
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/source/arm9/image.c154
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/source/arm9/keys.c140
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/source/arm9/ndsmotion.c20
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/source/arm9/pcx.c170
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/source/arm9/rumble.c152
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/source/arm9/sound.c140
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/source/arm9/touch.c146
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/source/arm9/videoGL.c40
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/source/common/biosCalls.S30
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/source/common/card.c16
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/source/common/gbfs.c144
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/source/common/interruptDispatcher.S56
-rw-r--r--c/src/lib/libbsp/arm/nds/libnds/source/common/interrupts.c37
43 files changed, 2241 insertions, 361 deletions
diff --git a/c/src/lib/libbsp/arm/nds/libnds/basicARM7/source/defaultARM7.c b/c/src/lib/libbsp/arm/nds/libnds/basicARM7/source/defaultARM7.c
index ca9d39796a..6cb092f04b 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/basicARM7/source/defaultARM7.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/basicARM7/source/defaultARM7.c
@@ -53,13 +53,13 @@ touchPosition first,tempPos;
void VcountHandler() {
//---------------------------------------------------------------------------------
static int lastbut = -1;
-
+
uint16 but=0, x=0, y=0, xpx=0, ypx=0, z1=0, z2=0;
but = REG_KEYXY;
if (!( (but ^ lastbut) & (1<<6))) {
-
+
tempPos = touchReadXY();
if ( tempPos.x == 0 || tempPos.y == 0 ) {
@@ -73,7 +73,7 @@ void VcountHandler() {
z1 = tempPos.z1;
z2 = tempPos.z2;
}
-
+
} else {
lastbut = but;
but |= (1 <<6);
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/audio.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/audio.h
index a1c6f8b777..124911e1b9 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/audio.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/audio.h
@@ -87,7 +87,7 @@ extern "C" {
/*---------------------------------------------------------------------------------
microphone code based on neimod's microphone example.
- See: http://neimod.com/dstek/
+ See: http://neimod.com/dstek/
Chris Double (chris.double@double.co.nz)
http://www.double.co.nz/nintendo_ds
---------------------------------------------------------------------------------*/
@@ -101,7 +101,7 @@ u8 MIC_ReadData();
/*---------------------------------------------------------------------------------
Fill the buffer with data from the microphone. The buffer will be
signed sound data at 16kHz. Once the length of the buffer is
- reached, no more data will be stored. Uses ARM7 timer 0.
+ reached, no more data will be stored. Uses ARM7 timer 0.
---------------------------------------------------------------------------------*/
void StartRecording(u8* buffer, int length);
@@ -116,7 +116,7 @@ void ProcessMicrophoneTimerIRQ();
void PM_SetAmp(u8 control);
//---------------------------------------------------------------------------------
-// Turn the microphone on
+// Turn the microphone on
//---------------------------------------------------------------------------------
static inline void MIC_On() {
//---------------------------------------------------------------------------------
@@ -125,7 +125,7 @@ static inline void MIC_On() {
//---------------------------------------------------------------------------------
-// Turn the microphone off
+// Turn the microphone off
//---------------------------------------------------------------------------------
static inline void MIC_Off() {
//---------------------------------------------------------------------------------
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/clock.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/clock.h
index c5a5dbc30d..7de64292b9 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/clock.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm7/clock.h
@@ -84,15 +84,15 @@ extern "C" {
1b Alarm 2 interrupt
7 R/W Test Mode (0=Normal, 1=Test, don't use) (cleared on Reset)
*/
-#define STATUS_TEST (1<<7) //
-#define STATUS_INT2AE (1<<6) //
+#define STATUS_TEST (1<<7) //
+#define STATUS_INT2AE (1<<6) //
#define STATUS_SC3 (1<<5) // R/W scratch bit
#define STATUS_SC2 (1<<4) // R/W scratch bit
#define STATUS_32kE (1<<3) // Interrupt mode bits
-#define STATUS_INT1AE (1<<2) //
-#define STATUS_INT1ME (1<<1) //
-#define STATUS_INT1FE (1<<0) //
+#define STATUS_INT1AE (1<<2) //
+#define STATUS_INT1ME (1<<1) //
+#define STATUS_INT1FE (1<<0) //
// full 7 bytes for time and date
#define WRITE_TIME_AND_DATE 0x64
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/boxtest.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/boxtest.h
index ee82f989e4..0ff895d351 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/boxtest.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/boxtest.h
@@ -35,10 +35,10 @@ distribution.
#include <nds/arm9/video.h>
#include <nds/arm9/videoGL.h>
-/*! \file boxtest.h
-\brief Box Test Functions.
+/*! \file boxtest.h
+\brief Box Test Functions.
-*/
+*/
#ifdef __cplusplus
extern "C" {
@@ -78,7 +78,7 @@ int BoxTestf(float x, float y, float z, float width, float height, float depth);
\param height (width, height, depth) describe the size of the box referenced from (x, y, z)
\param depth (width, height, depth) describe the size of the box referenced from (x, y, z)
-Performs a test to determine if the provided box is in the view frustum. BoxTestResult must be called to get the result of this
+Performs a test to determine if the provided box is in the view frustum. BoxTestResult must be called to get the result of this
operation.
*/
void BoxTest_Asynch(v16 x, v16 y, v16 z, v16 height, v16 width, v16 depth);
@@ -92,7 +92,7 @@ void BoxTest_Asynch(v16 x, v16 y, v16 z, v16 height, v16 width, v16 depth);
\param height (width, height, depth) describe the size of the box referenced from (x, y, z)
\param depth (width, height, depth) describe the size of the box referenced from (x, y, z)
-Performs a test to determine if the provided box is in the view frustum. BoxTestResult must be called to get the result of this
+Performs a test to determine if the provided box is in the view frustum. BoxTestResult must be called to get the result of this
operation.
*/
void BoxTestf_Asynch(float x, float y, float z, float width, float height, float depth);
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/cache.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/cache.h
index 08a6158aa7..949a45fb98 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/cache.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/cache.h
@@ -45,7 +45,7 @@ extern "C" {
*/
void IC_InvalidateAll(void);
-
+
/*! \fn IC_InvalidateRange(const void *base, u32 size)
\brief invalidate the instruction cache for a range of addresses.
\param base base address of the region to invalidate
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/console.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/console.h
index 19ac5382f9..beb87d407b 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/console.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/console.h
@@ -50,12 +50,12 @@ extern "C" {
\param charStart ascii code of the first character in the font
\param map base address of the map to use for printing
\param pal 16 color palette index to use
- \param bitDepth 256/16 color tile flag.
-
+ \param bitDepth 256/16 color tile flag.
+
Initializes the console with the given parameters. When pal is greater than 15 and
bitDepth is 16 then all non zero entries in the font are set to index 255. When bitDepth
is not 16 then the font tiles are created as 8bit (256 color).
-
+
*/
void consoleInit(u16* font, u16* charBase, u16 numCharacters, u8 charStart, u16* map, u8 pal, u8 bitDepth);
/*! \fn void consoleInitDefault(u16* map, u16* charBase, u8 bitDepth)
@@ -65,7 +65,7 @@ void consoleInit(u16* font, u16* charBase, u16 numCharacters, u8 charStart, u16*
\param bitDepth 256/16 color tile flag
This function calls consoleInit() with the default built in font and character ranges, the parameters given
- are as for that function.
+ are as for that function.
*/
void consoleInitDefault(u16* map, u16* charBase, u8 bitDepth);
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/image.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/image.h
index 3764afccb1..b57622b9f3 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/image.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/image.h
@@ -24,16 +24,154 @@
distribution.
$Log$
+ Revision 1.1 2008/04/16 18:37:32 joel
+ 2008-04-16 Matthieu Bucchianeri <mbucchia@gmail.com>
+
+ * ChangeLog, Makefile.am, README, bsp_specs, configure.ac,
+ mk_libnds.sh, patch.libnds, preinstall.am, block/block.c,
+ clock/clock.c, console/console.c, coproc/coproc.S, coproc/coproc.c,
+ coproc/coproc.ld, dswifi/dswifi_license.txt, dswifi/makefile,
+ dswifi/arm7/makefile, dswifi/arm7/source/wifi_arm7.c,
+ dswifi/arm7/source/wifi_arm7.h, dswifi/arm9/makefile,
+ dswifi/arm9/source/sgIP.c, dswifi/arm9/source/sgIP.h,
+ dswifi/arm9/source/sgIP_ARP.c, dswifi/arm9/source/sgIP_ARP.h,
+ dswifi/arm9/source/sgIP_Config.h, dswifi/arm9/source/sgIP_DHCP.c,
+ dswifi/arm9/source/sgIP_DHCP.h, dswifi/arm9/source/sgIP_DNS.c,
+ dswifi/arm9/source/sgIP_DNS.h, dswifi/arm9/source/sgIP_Hub.c,
+ dswifi/arm9/source/sgIP_Hub.h, dswifi/arm9/source/sgIP_ICMP.c,
+ dswifi/arm9/source/sgIP_ICMP.h, dswifi/arm9/source/sgIP_IP.c,
+ dswifi/arm9/source/sgIP_IP.h, dswifi/arm9/source/sgIP_TCP.c,
+ dswifi/arm9/source/sgIP_TCP.h, dswifi/arm9/source/sgIP_UDP.c,
+ dswifi/arm9/source/sgIP_UDP.h, dswifi/arm9/source/sgIP_memblock.c,
+ dswifi/arm9/source/sgIP_memblock.h,
+ dswifi/arm9/source/sgIP_sockets.c, dswifi/arm9/source/sgIP_sockets.h,
+ dswifi/arm9/source/wifi_arm9.c, dswifi/arm9/source/wifi_arm9.h,
+ dswifi/common/source/dsregs.h, dswifi/common/source/spinlock.h,
+ dswifi/common/source/spinlock.s, dswifi/common/source/wifi_shared.h,
+ dswifi/include/dswifi7.h, dswifi/include/dswifi9.h,
+ dswifi/include/dswifi_version.h, dswifi/include/netdb.h,
+ dswifi/include/sgIP_errno.h, dswifi/include/netinet/in.h, fb/fb.c,
+ fb/fb.h, include/bsp.h, include/my_ipc.h, include/tm27.h,
+ include/types.h, include/sys/iosupport.h, irq/irq.c, irq/irq.h,
+ libfat/gba/include/fat.h, libfat/include/fat.h,
+ libfat/nds/include/fat.h, libfat/source/bit_ops.h,
+ libfat/source/cache.c, libfat/source/cache.h, libfat/source/common.h,
+ libfat/source/directory.c, libfat/source/directory.h,
+ libfat/source/fatdir.c, libfat/source/fatdir.h,
+ libfat/source/fatfile.c, libfat/source/fatfile.h,
+ libfat/source/file_allocation_table.c,
+ libfat/source/file_allocation_table.h, libfat/source/filetime.c,
+ libfat/source/filetime.h, libfat/source/libfat.c,
+ libfat/source/mem_allocate.h, libfat/source/partition.c,
+ libfat/source/partition.h, libfat/source/disc_io/disc.c,
+ libfat/source/disc_io/disc.h, libfat/source/disc_io/disc_io.h,
+ libfat/source/disc_io/io_cf_common.c,
+ libfat/source/disc_io/io_cf_common.h,
+ libfat/source/disc_io/io_dldi.h, libfat/source/disc_io/io_dldi.s,
+ libfat/source/disc_io/io_efa2.c, libfat/source/disc_io/io_efa2.h,
+ libfat/source/disc_io/io_fcsr.c, libfat/source/disc_io/io_fcsr.h,
+ libfat/source/disc_io/io_m3_common.c,
+ libfat/source/disc_io/io_m3_common.h,
+ libfat/source/disc_io/io_m3cf.c, libfat/source/disc_io/io_m3cf.h,
+ libfat/source/disc_io/io_m3sd.c, libfat/source/disc_io/io_m3sd.h,
+ libfat/source/disc_io/io_mpcf.c, libfat/source/disc_io/io_mpcf.h,
+ libfat/source/disc_io/io_njsd.c, libfat/source/disc_io/io_njsd.h,
+ libfat/source/disc_io/io_nmmc.c, libfat/source/disc_io/io_nmmc.h,
+ libfat/source/disc_io/io_sc_common.c,
+ libfat/source/disc_io/io_sc_common.h,
+ libfat/source/disc_io/io_sccf.c, libfat/source/disc_io/io_sccf.h,
+ libfat/source/disc_io/io_scsd.c, libfat/source/disc_io/io_scsd.h,
+ libfat/source/disc_io/io_scsd_s.s,
+ libfat/source/disc_io/io_sd_common.c,
+ libfat/source/disc_io/io_sd_common.h, libnds/Makefile.arm7,
+ libnds/Makefile.arm9, libnds/libnds_license.txt,
+ libnds/basicARM7/source/defaultARM7.c,
+ libnds/include/default_font_bin.h, libnds/include/gbfs.h,
+ libnds/include/nds.h, libnds/include/nds/bios.h,
+ libnds/include/nds/card.h, libnds/include/nds/dma.h,
+ libnds/include/nds/interrupts.h, libnds/include/nds/ipc.h,
+ libnds/include/nds/jtypes.h, libnds/include/nds/memory.h,
+ libnds/include/nds/registers_alt.h, libnds/include/nds/reload.h,
+ libnds/include/nds/system.h, libnds/include/nds/timers.h,
+ libnds/include/nds/arm7/audio.h, libnds/include/nds/arm7/clock.h,
+ libnds/include/nds/arm7/serial.h, libnds/include/nds/arm7/touch.h,
+ libnds/include/nds/arm9/background.h,
+ libnds/include/nds/arm9/boxtest.h, libnds/include/nds/arm9/cache.h,
+ libnds/include/nds/arm9/console.h,
+ libnds/include/nds/arm9/exceptions.h,
+ libnds/include/nds/arm9/image.h, libnds/include/nds/arm9/input.h,
+ libnds/include/nds/arm9/math.h, libnds/include/nds/arm9/ndsmotion.h,
+ libnds/include/nds/arm9/pcx.h, libnds/include/nds/arm9/postest.h,
+ libnds/include/nds/arm9/rumble.h, libnds/include/nds/arm9/sound.h,
+ libnds/include/nds/arm9/sprite.h, libnds/include/nds/arm9/trig_lut.h,
+ libnds/include/nds/arm9/video.h, libnds/include/nds/arm9/videoGL.h,
+ libnds/source/arm7/audio.c, libnds/source/arm7/clock.c,
+ libnds/source/arm7/microphone.c, libnds/source/arm7/spi.c,
+ libnds/source/arm7/touch.c, libnds/source/arm7/userSettings.c,
+ libnds/source/arm9/COS.bin, libnds/source/arm9/COS.s,
+ libnds/source/arm9/SIN.bin, libnds/source/arm9/SIN.s,
+ libnds/source/arm9/TAN.bin, libnds/source/arm9/TAN.s,
+ libnds/source/arm9/boxtest.c, libnds/source/arm9/console.c,
+ libnds/source/arm9/dcache.s, libnds/source/arm9/default_font.bin,
+ libnds/source/arm9/default_font.s,
+ libnds/source/arm9/exceptionHandler.S,
+ libnds/source/arm9/exceptionHandler.s,
+ libnds/source/arm9/exceptions.c, libnds/source/arm9/gurumeditation.c,
+ libnds/source/arm9/icache.s, libnds/source/arm9/image.c,
+ libnds/source/arm9/initSystem.c, libnds/source/arm9/keys.c,
+ libnds/source/arm9/ndsmotion.c, libnds/source/arm9/pcx.c,
+ libnds/source/arm9/rumble.c, libnds/source/arm9/sound.c,
+ libnds/source/arm9/system.c, libnds/source/arm9/touch.c,
+ libnds/source/arm9/video.c, libnds/source/arm9/videoGL.c,
+ libnds/source/common/biosCalls.s, libnds/source/common/card.c,
+ libnds/source/common/gbfs.c,
+ libnds/source/common/interruptDispatcher.s,
+ libnds/source/common/interrupts.c, rtc/rtc.c, sound/sound.c,
+ sound/sound.h, start/start.S, startup/linkcmds, startup/start.c,
+ timer/timer.c, tools/Makefile.am, tools/bin2s, tools/bin2s.c,
+ tools/configure.ac, tools/runtest,
+ tools/ndstool/include/arm7_sha1_homebrew.h,
+ tools/ndstool/include/arm7_sha1_nintendo.h,
+ tools/ndstool/include/banner.h, tools/ndstool/include/bigint.h,
+ tools/ndstool/include/crc.h, tools/ndstool/include/default_icon.h,
+ tools/ndstool/include/encryption.h, tools/ndstool/include/header.h,
+ tools/ndstool/include/hook.h, tools/ndstool/include/little.h,
+ tools/ndstool/include/loadme.h, tools/ndstool/include/logo.h,
+ tools/ndstool/include/ndscreate.h,
+ tools/ndstool/include/ndsextract.h, tools/ndstool/include/ndstool.h,
+ tools/ndstool/include/ndstree.h, tools/ndstool/include/overlay.h,
+ tools/ndstool/include/passme.h, tools/ndstool/include/passme_sram.h,
+ tools/ndstool/include/passme_vhd1.h,
+ tools/ndstool/include/passme_vhd2.h, tools/ndstool/include/raster.h,
+ tools/ndstool/include/sha1.h, tools/ndstool/include/types.h,
+ tools/ndstool/source/arm7_sha1_homebrew.c,
+ tools/ndstool/source/arm7_sha1_nintendo.c,
+ tools/ndstool/source/banner.cpp, tools/ndstool/source/bigint.cpp,
+ tools/ndstool/source/compile_date.c, tools/ndstool/source/crc.cpp,
+ tools/ndstool/source/default_icon.c,
+ tools/ndstool/source/encryption.cpp, tools/ndstool/source/header.cpp,
+ tools/ndstool/source/hook.cpp, tools/ndstool/source/loadme.c,
+ tools/ndstool/source/logo.cpp, tools/ndstool/source/ndscodes.cpp,
+ tools/ndstool/source/ndscreate.cpp,
+ tools/ndstool/source/ndsextract.cpp,
+ tools/ndstool/source/ndstool.cpp, tools/ndstool/source/ndstree.cpp,
+ tools/ndstool/source/passme.cpp, tools/ndstool/source/passme_sram.c,
+ tools/ndstool/source/raster.cpp, tools/ndstool/source/sha1.cpp,
+ touchscreen/README.reco, touchscreen/parser.c, touchscreen/reco.c,
+ touchscreen/reco.h, touchscreen/touchscreen.c,
+ touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c:
+ New files.
+
Revision 1.5 2007/01/19 14:45:59 wntrmute
name anonymous structs and unions for -std=c99
-
+
Revision 1.4 2005/10/11 05:05:26 dovoto
Added imageTileData(sImage* img) to allow loading of pcx as sprite data.
Updated pcx.c to set image bit per pixel field
-
+
Revision 1.3 2005/08/30 17:56:21 wntrmute
add video.h
-
+
Revision 1.2 2005/08/11 14:53:00 desktopman
Added image24to16(sImage* img)
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/input.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/input.h
index 450ec80bd8..ed7531bd51 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/input.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/input.h
@@ -27,9 +27,30 @@
distribution.
$Log$
+ Revision 1.2 2008/08/20 16:31:41 joel
+ 2008-08-20 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * block/block.c, console/console.c, dswifi/arm9/source/sgIP.h,
+ dswifi/arm9/source/sgIP_ARP.h, dswifi/arm9/source/sgIP_Config.h,
+ dswifi/arm9/source/sgIP_DHCP.h, dswifi/arm9/source/sgIP_DNS.h,
+ dswifi/arm9/source/sgIP_Hub.h, dswifi/arm9/source/sgIP_ICMP.h,
+ dswifi/arm9/source/sgIP_IP.h, dswifi/arm9/source/sgIP_TCP.h,
+ dswifi/arm9/source/sgIP_UDP.h, dswifi/arm9/source/sgIP_memblock.h,
+ dswifi/arm9/source/wifi_arm9.c, dswifi/arm9/source/wifi_arm9.h,
+ dswifi/include/dswifi7.h, dswifi/include/dswifi9.h, fb/fb.c,
+ include/my_ipc.h, libfat/source/disc_io/disc_io.h,
+ libfat/source/disc_io/io_nmmc.c,
+ libnds/include/nds/arm9/exceptions.h,
+ libnds/include/nds/arm9/input.h, libnds/include/nds/arm9/ndsmotion.h,
+ libnds/include/nds/arm9/videoGL.h, libnds/source/arm9/console.c,
+ libnds/source/arm9/gurumeditation.c, libnds/source/arm9/ndsmotion.c,
+ libnds/source/common/card.c, libnds/source/common/interrupts.c,
+ sound/sound.c, startup/start.c, touchscreen/reco.h, wifi/compat.c,
+ wifi/compat.h: Fix most warnings.
+
Revision 1.1 2008/04/16 18:37:32 joel
2008-04-16 Matthieu Bucchianeri <mbucchia@gmail.com>
-
+
* ChangeLog, Makefile.am, README, bsp_specs, configure.ac,
mk_libnds.sh, patch.libnds, preinstall.am, block/block.c,
clock/clock.c, console/console.c, coproc/coproc.S, coproc/coproc.c,
@@ -164,44 +185,44 @@
touchscreen/reco.h, touchscreen/touchscreen.c,
touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c:
New files.
-
+
Revision 1.14 2006/02/25 02:18:53 wntrmute
doxygenation updates
-
+
Revision 1.13 2006/01/12 09:10:47 wntrmute
Added key repeat as suggested by pepsiman
-
+
Revision 1.12 2006/01/10 05:50:24 dovoto
uhmm...about that KEY_R vs KEY_L thing...lets pretend that never happened
-
+
Revision 1.11 2006/01/10 05:45:24 dovoto
KEY_L and KEY_R were swapped
-
+
Revision 1.10 2005/11/27 07:55:14 joatski
Fixed my mistake in the changelogs
-
+
Revision 1.9 2005/11/27 07:48:45 joatski
Changed function returns to uint32
-
+
Revision 1.8 2005/11/14 11:59:49 wntrmute
reformat for consistency
-
+
Revision 1.7 2005/11/03 23:38:49 wntrmute
don't use enum for key function returns
-
+
Revision 1.6 2005/10/18 04:17:04 wntrmute
doxygenation
-
+
Revision 1.5 2005/10/13 16:30:11 dovoto
Changed KEYPAD_BITS to a typedef enum, this resolved some issues with multiple redefinition of KEYPAD_BITS (although this error did not allways occur).
-
+
Revision 1.4 2005/10/03 21:21:21 wntrmute
doxygenation
-
+
Revision 1.3 2005/09/07 18:03:36 wntrmute
renamed key input registers
moved key bit definitions to input.h
-
+
Revision 1.2 2005/08/23 17:06:10 wntrmute
converted all endings to unix
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/math.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/math.h
index be7439c8e8..e740acb24c 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/math.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/math.h
@@ -26,12 +26,150 @@
distribution.
$Log$
+ Revision 1.1 2008/04/16 18:37:32 joel
+ 2008-04-16 Matthieu Bucchianeri <mbucchia@gmail.com>
+
+ * ChangeLog, Makefile.am, README, bsp_specs, configure.ac,
+ mk_libnds.sh, patch.libnds, preinstall.am, block/block.c,
+ clock/clock.c, console/console.c, coproc/coproc.S, coproc/coproc.c,
+ coproc/coproc.ld, dswifi/dswifi_license.txt, dswifi/makefile,
+ dswifi/arm7/makefile, dswifi/arm7/source/wifi_arm7.c,
+ dswifi/arm7/source/wifi_arm7.h, dswifi/arm9/makefile,
+ dswifi/arm9/source/sgIP.c, dswifi/arm9/source/sgIP.h,
+ dswifi/arm9/source/sgIP_ARP.c, dswifi/arm9/source/sgIP_ARP.h,
+ dswifi/arm9/source/sgIP_Config.h, dswifi/arm9/source/sgIP_DHCP.c,
+ dswifi/arm9/source/sgIP_DHCP.h, dswifi/arm9/source/sgIP_DNS.c,
+ dswifi/arm9/source/sgIP_DNS.h, dswifi/arm9/source/sgIP_Hub.c,
+ dswifi/arm9/source/sgIP_Hub.h, dswifi/arm9/source/sgIP_ICMP.c,
+ dswifi/arm9/source/sgIP_ICMP.h, dswifi/arm9/source/sgIP_IP.c,
+ dswifi/arm9/source/sgIP_IP.h, dswifi/arm9/source/sgIP_TCP.c,
+ dswifi/arm9/source/sgIP_TCP.h, dswifi/arm9/source/sgIP_UDP.c,
+ dswifi/arm9/source/sgIP_UDP.h, dswifi/arm9/source/sgIP_memblock.c,
+ dswifi/arm9/source/sgIP_memblock.h,
+ dswifi/arm9/source/sgIP_sockets.c, dswifi/arm9/source/sgIP_sockets.h,
+ dswifi/arm9/source/wifi_arm9.c, dswifi/arm9/source/wifi_arm9.h,
+ dswifi/common/source/dsregs.h, dswifi/common/source/spinlock.h,
+ dswifi/common/source/spinlock.s, dswifi/common/source/wifi_shared.h,
+ dswifi/include/dswifi7.h, dswifi/include/dswifi9.h,
+ dswifi/include/dswifi_version.h, dswifi/include/netdb.h,
+ dswifi/include/sgIP_errno.h, dswifi/include/netinet/in.h, fb/fb.c,
+ fb/fb.h, include/bsp.h, include/my_ipc.h, include/tm27.h,
+ include/types.h, include/sys/iosupport.h, irq/irq.c, irq/irq.h,
+ libfat/gba/include/fat.h, libfat/include/fat.h,
+ libfat/nds/include/fat.h, libfat/source/bit_ops.h,
+ libfat/source/cache.c, libfat/source/cache.h, libfat/source/common.h,
+ libfat/source/directory.c, libfat/source/directory.h,
+ libfat/source/fatdir.c, libfat/source/fatdir.h,
+ libfat/source/fatfile.c, libfat/source/fatfile.h,
+ libfat/source/file_allocation_table.c,
+ libfat/source/file_allocation_table.h, libfat/source/filetime.c,
+ libfat/source/filetime.h, libfat/source/libfat.c,
+ libfat/source/mem_allocate.h, libfat/source/partition.c,
+ libfat/source/partition.h, libfat/source/disc_io/disc.c,
+ libfat/source/disc_io/disc.h, libfat/source/disc_io/disc_io.h,
+ libfat/source/disc_io/io_cf_common.c,
+ libfat/source/disc_io/io_cf_common.h,
+ libfat/source/disc_io/io_dldi.h, libfat/source/disc_io/io_dldi.s,
+ libfat/source/disc_io/io_efa2.c, libfat/source/disc_io/io_efa2.h,
+ libfat/source/disc_io/io_fcsr.c, libfat/source/disc_io/io_fcsr.h,
+ libfat/source/disc_io/io_m3_common.c,
+ libfat/source/disc_io/io_m3_common.h,
+ libfat/source/disc_io/io_m3cf.c, libfat/source/disc_io/io_m3cf.h,
+ libfat/source/disc_io/io_m3sd.c, libfat/source/disc_io/io_m3sd.h,
+ libfat/source/disc_io/io_mpcf.c, libfat/source/disc_io/io_mpcf.h,
+ libfat/source/disc_io/io_njsd.c, libfat/source/disc_io/io_njsd.h,
+ libfat/source/disc_io/io_nmmc.c, libfat/source/disc_io/io_nmmc.h,
+ libfat/source/disc_io/io_sc_common.c,
+ libfat/source/disc_io/io_sc_common.h,
+ libfat/source/disc_io/io_sccf.c, libfat/source/disc_io/io_sccf.h,
+ libfat/source/disc_io/io_scsd.c, libfat/source/disc_io/io_scsd.h,
+ libfat/source/disc_io/io_scsd_s.s,
+ libfat/source/disc_io/io_sd_common.c,
+ libfat/source/disc_io/io_sd_common.h, libnds/Makefile.arm7,
+ libnds/Makefile.arm9, libnds/libnds_license.txt,
+ libnds/basicARM7/source/defaultARM7.c,
+ libnds/include/default_font_bin.h, libnds/include/gbfs.h,
+ libnds/include/nds.h, libnds/include/nds/bios.h,
+ libnds/include/nds/card.h, libnds/include/nds/dma.h,
+ libnds/include/nds/interrupts.h, libnds/include/nds/ipc.h,
+ libnds/include/nds/jtypes.h, libnds/include/nds/memory.h,
+ libnds/include/nds/registers_alt.h, libnds/include/nds/reload.h,
+ libnds/include/nds/system.h, libnds/include/nds/timers.h,
+ libnds/include/nds/arm7/audio.h, libnds/include/nds/arm7/clock.h,
+ libnds/include/nds/arm7/serial.h, libnds/include/nds/arm7/touch.h,
+ libnds/include/nds/arm9/background.h,
+ libnds/include/nds/arm9/boxtest.h, libnds/include/nds/arm9/cache.h,
+ libnds/include/nds/arm9/console.h,
+ libnds/include/nds/arm9/exceptions.h,
+ libnds/include/nds/arm9/image.h, libnds/include/nds/arm9/input.h,
+ libnds/include/nds/arm9/math.h, libnds/include/nds/arm9/ndsmotion.h,
+ libnds/include/nds/arm9/pcx.h, libnds/include/nds/arm9/postest.h,
+ libnds/include/nds/arm9/rumble.h, libnds/include/nds/arm9/sound.h,
+ libnds/include/nds/arm9/sprite.h, libnds/include/nds/arm9/trig_lut.h,
+ libnds/include/nds/arm9/video.h, libnds/include/nds/arm9/videoGL.h,
+ libnds/source/arm7/audio.c, libnds/source/arm7/clock.c,
+ libnds/source/arm7/microphone.c, libnds/source/arm7/spi.c,
+ libnds/source/arm7/touch.c, libnds/source/arm7/userSettings.c,
+ libnds/source/arm9/COS.bin, libnds/source/arm9/COS.s,
+ libnds/source/arm9/SIN.bin, libnds/source/arm9/SIN.s,
+ libnds/source/arm9/TAN.bin, libnds/source/arm9/TAN.s,
+ libnds/source/arm9/boxtest.c, libnds/source/arm9/console.c,
+ libnds/source/arm9/dcache.s, libnds/source/arm9/default_font.bin,
+ libnds/source/arm9/default_font.s,
+ libnds/source/arm9/exceptionHandler.S,
+ libnds/source/arm9/exceptionHandler.s,
+ libnds/source/arm9/exceptions.c, libnds/source/arm9/gurumeditation.c,
+ libnds/source/arm9/icache.s, libnds/source/arm9/image.c,
+ libnds/source/arm9/initSystem.c, libnds/source/arm9/keys.c,
+ libnds/source/arm9/ndsmotion.c, libnds/source/arm9/pcx.c,
+ libnds/source/arm9/rumble.c, libnds/source/arm9/sound.c,
+ libnds/source/arm9/system.c, libnds/source/arm9/touch.c,
+ libnds/source/arm9/video.c, libnds/source/arm9/videoGL.c,
+ libnds/source/common/biosCalls.s, libnds/source/common/card.c,
+ libnds/source/common/gbfs.c,
+ libnds/source/common/interruptDispatcher.s,
+ libnds/source/common/interrupts.c, rtc/rtc.c, sound/sound.c,
+ sound/sound.h, start/start.S, startup/linkcmds, startup/start.c,
+ timer/timer.c, tools/Makefile.am, tools/bin2s, tools/bin2s.c,
+ tools/configure.ac, tools/runtest,
+ tools/ndstool/include/arm7_sha1_homebrew.h,
+ tools/ndstool/include/arm7_sha1_nintendo.h,
+ tools/ndstool/include/banner.h, tools/ndstool/include/bigint.h,
+ tools/ndstool/include/crc.h, tools/ndstool/include/default_icon.h,
+ tools/ndstool/include/encryption.h, tools/ndstool/include/header.h,
+ tools/ndstool/include/hook.h, tools/ndstool/include/little.h,
+ tools/ndstool/include/loadme.h, tools/ndstool/include/logo.h,
+ tools/ndstool/include/ndscreate.h,
+ tools/ndstool/include/ndsextract.h, tools/ndstool/include/ndstool.h,
+ tools/ndstool/include/ndstree.h, tools/ndstool/include/overlay.h,
+ tools/ndstool/include/passme.h, tools/ndstool/include/passme_sram.h,
+ tools/ndstool/include/passme_vhd1.h,
+ tools/ndstool/include/passme_vhd2.h, tools/ndstool/include/raster.h,
+ tools/ndstool/include/sha1.h, tools/ndstool/include/types.h,
+ tools/ndstool/source/arm7_sha1_homebrew.c,
+ tools/ndstool/source/arm7_sha1_nintendo.c,
+ tools/ndstool/source/banner.cpp, tools/ndstool/source/bigint.cpp,
+ tools/ndstool/source/compile_date.c, tools/ndstool/source/crc.cpp,
+ tools/ndstool/source/default_icon.c,
+ tools/ndstool/source/encryption.cpp, tools/ndstool/source/header.cpp,
+ tools/ndstool/source/hook.cpp, tools/ndstool/source/loadme.c,
+ tools/ndstool/source/logo.cpp, tools/ndstool/source/ndscodes.cpp,
+ tools/ndstool/source/ndscreate.cpp,
+ tools/ndstool/source/ndsextract.cpp,
+ tools/ndstool/source/ndstool.cpp, tools/ndstool/source/ndstree.cpp,
+ tools/ndstool/source/passme.cpp, tools/ndstool/source/passme_sram.c,
+ tools/ndstool/source/raster.cpp, tools/ndstool/source/sha1.cpp,
+ touchscreen/README.reco, touchscreen/parser.c, touchscreen/reco.c,
+ touchscreen/reco.h, touchscreen/touchscreen.c,
+ touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c:
+ New files.
+
Revision 1.12 2007/01/14 11:31:22 wntrmute
bogus fixed types removed from libnds
-
+
Revision 1.11 2006/07/06 02:16:01 wntrmute
tidy formatting
-
+
Revision 1.10 2006/06/01 01:44:26 crossraleigh
Fixed spelling of DIV_REMAINDER
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/ndsmotion.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/ndsmotion.h
index 6335cadf35..322793c918 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/ndsmotion.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/ndsmotion.h
@@ -2,7 +2,7 @@
$Id$
DS Motion Card/DS Motion Pak functionality
-
+
Copyright (C) 2007
Michael Noland (joat)
Jason Rogers (dovoto)
@@ -28,8 +28,8 @@
---------------------------------------------------------------------------------*/
-/*! \file ndsmotion.h
-\brief interface code for the ds motion card, ds motion pak, MK6
+/*! \file ndsmotion.h
+\brief interface code for the ds motion card, ds motion pak, MK6
*/
#ifndef NDS_MOTION_INCLUDE
@@ -37,7 +37,7 @@
//---------------------------------------------------------------------------------
-typedef struct
+typedef struct
{
short xoff, yoff, zoff, goff;
short xsens, ysens, zsens, gsens;
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/pcx.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/pcx.h
index 03bab707eb..68843d4973 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/pcx.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/pcx.h
@@ -24,34 +24,172 @@
distribution.
$Log$
+ Revision 1.1 2008/04/16 18:37:32 joel
+ 2008-04-16 Matthieu Bucchianeri <mbucchia@gmail.com>
+
+ * ChangeLog, Makefile.am, README, bsp_specs, configure.ac,
+ mk_libnds.sh, patch.libnds, preinstall.am, block/block.c,
+ clock/clock.c, console/console.c, coproc/coproc.S, coproc/coproc.c,
+ coproc/coproc.ld, dswifi/dswifi_license.txt, dswifi/makefile,
+ dswifi/arm7/makefile, dswifi/arm7/source/wifi_arm7.c,
+ dswifi/arm7/source/wifi_arm7.h, dswifi/arm9/makefile,
+ dswifi/arm9/source/sgIP.c, dswifi/arm9/source/sgIP.h,
+ dswifi/arm9/source/sgIP_ARP.c, dswifi/arm9/source/sgIP_ARP.h,
+ dswifi/arm9/source/sgIP_Config.h, dswifi/arm9/source/sgIP_DHCP.c,
+ dswifi/arm9/source/sgIP_DHCP.h, dswifi/arm9/source/sgIP_DNS.c,
+ dswifi/arm9/source/sgIP_DNS.h, dswifi/arm9/source/sgIP_Hub.c,
+ dswifi/arm9/source/sgIP_Hub.h, dswifi/arm9/source/sgIP_ICMP.c,
+ dswifi/arm9/source/sgIP_ICMP.h, dswifi/arm9/source/sgIP_IP.c,
+ dswifi/arm9/source/sgIP_IP.h, dswifi/arm9/source/sgIP_TCP.c,
+ dswifi/arm9/source/sgIP_TCP.h, dswifi/arm9/source/sgIP_UDP.c,
+ dswifi/arm9/source/sgIP_UDP.h, dswifi/arm9/source/sgIP_memblock.c,
+ dswifi/arm9/source/sgIP_memblock.h,
+ dswifi/arm9/source/sgIP_sockets.c, dswifi/arm9/source/sgIP_sockets.h,
+ dswifi/arm9/source/wifi_arm9.c, dswifi/arm9/source/wifi_arm9.h,
+ dswifi/common/source/dsregs.h, dswifi/common/source/spinlock.h,
+ dswifi/common/source/spinlock.s, dswifi/common/source/wifi_shared.h,
+ dswifi/include/dswifi7.h, dswifi/include/dswifi9.h,
+ dswifi/include/dswifi_version.h, dswifi/include/netdb.h,
+ dswifi/include/sgIP_errno.h, dswifi/include/netinet/in.h, fb/fb.c,
+ fb/fb.h, include/bsp.h, include/my_ipc.h, include/tm27.h,
+ include/types.h, include/sys/iosupport.h, irq/irq.c, irq/irq.h,
+ libfat/gba/include/fat.h, libfat/include/fat.h,
+ libfat/nds/include/fat.h, libfat/source/bit_ops.h,
+ libfat/source/cache.c, libfat/source/cache.h, libfat/source/common.h,
+ libfat/source/directory.c, libfat/source/directory.h,
+ libfat/source/fatdir.c, libfat/source/fatdir.h,
+ libfat/source/fatfile.c, libfat/source/fatfile.h,
+ libfat/source/file_allocation_table.c,
+ libfat/source/file_allocation_table.h, libfat/source/filetime.c,
+ libfat/source/filetime.h, libfat/source/libfat.c,
+ libfat/source/mem_allocate.h, libfat/source/partition.c,
+ libfat/source/partition.h, libfat/source/disc_io/disc.c,
+ libfat/source/disc_io/disc.h, libfat/source/disc_io/disc_io.h,
+ libfat/source/disc_io/io_cf_common.c,
+ libfat/source/disc_io/io_cf_common.h,
+ libfat/source/disc_io/io_dldi.h, libfat/source/disc_io/io_dldi.s,
+ libfat/source/disc_io/io_efa2.c, libfat/source/disc_io/io_efa2.h,
+ libfat/source/disc_io/io_fcsr.c, libfat/source/disc_io/io_fcsr.h,
+ libfat/source/disc_io/io_m3_common.c,
+ libfat/source/disc_io/io_m3_common.h,
+ libfat/source/disc_io/io_m3cf.c, libfat/source/disc_io/io_m3cf.h,
+ libfat/source/disc_io/io_m3sd.c, libfat/source/disc_io/io_m3sd.h,
+ libfat/source/disc_io/io_mpcf.c, libfat/source/disc_io/io_mpcf.h,
+ libfat/source/disc_io/io_njsd.c, libfat/source/disc_io/io_njsd.h,
+ libfat/source/disc_io/io_nmmc.c, libfat/source/disc_io/io_nmmc.h,
+ libfat/source/disc_io/io_sc_common.c,
+ libfat/source/disc_io/io_sc_common.h,
+ libfat/source/disc_io/io_sccf.c, libfat/source/disc_io/io_sccf.h,
+ libfat/source/disc_io/io_scsd.c, libfat/source/disc_io/io_scsd.h,
+ libfat/source/disc_io/io_scsd_s.s,
+ libfat/source/disc_io/io_sd_common.c,
+ libfat/source/disc_io/io_sd_common.h, libnds/Makefile.arm7,
+ libnds/Makefile.arm9, libnds/libnds_license.txt,
+ libnds/basicARM7/source/defaultARM7.c,
+ libnds/include/default_font_bin.h, libnds/include/gbfs.h,
+ libnds/include/nds.h, libnds/include/nds/bios.h,
+ libnds/include/nds/card.h, libnds/include/nds/dma.h,
+ libnds/include/nds/interrupts.h, libnds/include/nds/ipc.h,
+ libnds/include/nds/jtypes.h, libnds/include/nds/memory.h,
+ libnds/include/nds/registers_alt.h, libnds/include/nds/reload.h,
+ libnds/include/nds/system.h, libnds/include/nds/timers.h,
+ libnds/include/nds/arm7/audio.h, libnds/include/nds/arm7/clock.h,
+ libnds/include/nds/arm7/serial.h, libnds/include/nds/arm7/touch.h,
+ libnds/include/nds/arm9/background.h,
+ libnds/include/nds/arm9/boxtest.h, libnds/include/nds/arm9/cache.h,
+ libnds/include/nds/arm9/console.h,
+ libnds/include/nds/arm9/exceptions.h,
+ libnds/include/nds/arm9/image.h, libnds/include/nds/arm9/input.h,
+ libnds/include/nds/arm9/math.h, libnds/include/nds/arm9/ndsmotion.h,
+ libnds/include/nds/arm9/pcx.h, libnds/include/nds/arm9/postest.h,
+ libnds/include/nds/arm9/rumble.h, libnds/include/nds/arm9/sound.h,
+ libnds/include/nds/arm9/sprite.h, libnds/include/nds/arm9/trig_lut.h,
+ libnds/include/nds/arm9/video.h, libnds/include/nds/arm9/videoGL.h,
+ libnds/source/arm7/audio.c, libnds/source/arm7/clock.c,
+ libnds/source/arm7/microphone.c, libnds/source/arm7/spi.c,
+ libnds/source/arm7/touch.c, libnds/source/arm7/userSettings.c,
+ libnds/source/arm9/COS.bin, libnds/source/arm9/COS.s,
+ libnds/source/arm9/SIN.bin, libnds/source/arm9/SIN.s,
+ libnds/source/arm9/TAN.bin, libnds/source/arm9/TAN.s,
+ libnds/source/arm9/boxtest.c, libnds/source/arm9/console.c,
+ libnds/source/arm9/dcache.s, libnds/source/arm9/default_font.bin,
+ libnds/source/arm9/default_font.s,
+ libnds/source/arm9/exceptionHandler.S,
+ libnds/source/arm9/exceptionHandler.s,
+ libnds/source/arm9/exceptions.c, libnds/source/arm9/gurumeditation.c,
+ libnds/source/arm9/icache.s, libnds/source/arm9/image.c,
+ libnds/source/arm9/initSystem.c, libnds/source/arm9/keys.c,
+ libnds/source/arm9/ndsmotion.c, libnds/source/arm9/pcx.c,
+ libnds/source/arm9/rumble.c, libnds/source/arm9/sound.c,
+ libnds/source/arm9/system.c, libnds/source/arm9/touch.c,
+ libnds/source/arm9/video.c, libnds/source/arm9/videoGL.c,
+ libnds/source/common/biosCalls.s, libnds/source/common/card.c,
+ libnds/source/common/gbfs.c,
+ libnds/source/common/interruptDispatcher.s,
+ libnds/source/common/interrupts.c, rtc/rtc.c, sound/sound.c,
+ sound/sound.h, start/start.S, startup/linkcmds, startup/start.c,
+ timer/timer.c, tools/Makefile.am, tools/bin2s, tools/bin2s.c,
+ tools/configure.ac, tools/runtest,
+ tools/ndstool/include/arm7_sha1_homebrew.h,
+ tools/ndstool/include/arm7_sha1_nintendo.h,
+ tools/ndstool/include/banner.h, tools/ndstool/include/bigint.h,
+ tools/ndstool/include/crc.h, tools/ndstool/include/default_icon.h,
+ tools/ndstool/include/encryption.h, tools/ndstool/include/header.h,
+ tools/ndstool/include/hook.h, tools/ndstool/include/little.h,
+ tools/ndstool/include/loadme.h, tools/ndstool/include/logo.h,
+ tools/ndstool/include/ndscreate.h,
+ tools/ndstool/include/ndsextract.h, tools/ndstool/include/ndstool.h,
+ tools/ndstool/include/ndstree.h, tools/ndstool/include/overlay.h,
+ tools/ndstool/include/passme.h, tools/ndstool/include/passme_sram.h,
+ tools/ndstool/include/passme_vhd1.h,
+ tools/ndstool/include/passme_vhd2.h, tools/ndstool/include/raster.h,
+ tools/ndstool/include/sha1.h, tools/ndstool/include/types.h,
+ tools/ndstool/source/arm7_sha1_homebrew.c,
+ tools/ndstool/source/arm7_sha1_nintendo.c,
+ tools/ndstool/source/banner.cpp, tools/ndstool/source/bigint.cpp,
+ tools/ndstool/source/compile_date.c, tools/ndstool/source/crc.cpp,
+ tools/ndstool/source/default_icon.c,
+ tools/ndstool/source/encryption.cpp, tools/ndstool/source/header.cpp,
+ tools/ndstool/source/hook.cpp, tools/ndstool/source/loadme.c,
+ tools/ndstool/source/logo.cpp, tools/ndstool/source/ndscodes.cpp,
+ tools/ndstool/source/ndscreate.cpp,
+ tools/ndstool/source/ndsextract.cpp,
+ tools/ndstool/source/ndstool.cpp, tools/ndstool/source/ndstree.cpp,
+ tools/ndstool/source/passme.cpp, tools/ndstool/source/passme_sram.c,
+ tools/ndstool/source/raster.cpp, tools/ndstool/source/sha1.cpp,
+ touchscreen/README.reco, touchscreen/parser.c, touchscreen/reco.c,
+ touchscreen/reco.h, touchscreen/touchscreen.c,
+ touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c:
+ New files.
+
Revision 1.3 2005/08/23 17:06:10 wntrmute
converted all endings to unix
-
+
Revision 1.2 2005/08/01 23:18:22 wntrmute
adjusted headers for logging
-
+
Revision 1.1 2005/07/27 02:20:52 wntrmute
add image functions
-
+
---------------------------------------------------------------------------------*/
#ifndef PCX_H
#define PCX_H
-
+
typedef struct
{
char manufacturer; //should be 0
- char version; //should be 5
+ char version; //should be 5
char encoding; //should be 1
char bitsPerPixel; //should be 8
short int xmin,ymin; //coordinates for top left,bottom right
- short int xmax,ymax;
+ short int xmax,ymax;
short int hres; //resolution
short int vres;
char palette16[48]; //16 color palette if 16 color image
char reserved; //ignore
char colorPlanes; //ignore
- short int bytesPerLine;
+ short int bytesPerLine;
short int paletteYype; //should be 2
char filler[58]; //ignore
}__attribute__ ((packed)) PCXHeader, *pPCXHeader;
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/postest.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/postest.h
index 022f0223a2..e08b3f4702 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/postest.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/postest.h
@@ -31,7 +31,7 @@ distribution.
#include <nds/arm9/video.h>
#include <nds/arm9/videoGL.h>
-/*! \brief true if the hardware is currently performing a position/vertex/box test.
+/*! \brief true if the hardware is currently performing a position/vertex/box test.
\return whether a test is being performed */
GL_STATIC_INL bool PosTestBusy() {
return (GFX_STATUS & BIT(0))!=0;
@@ -40,7 +40,7 @@ GL_STATIC_INL bool PosTestBusy() {
/*! \file postest.h
\brief Position Test Functions.<BR>
The position test multiplies a given vector by the position matrix and returns the coords(x,y,z,w). The position test is really quick, about 10x faster than a box test.
-*/
+*/
/*! \brief Starts a position test asynchronously
\param x specifies x offset from the current modelview matrix
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/rumble.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/rumble.h
index 2e0fb60b51..49e915dcf1 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/rumble.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/rumble.h
@@ -1,6 +1,6 @@
/*---------------------------------------------------------------------------------
$Id$
-
+
Copyright (C) 2005
Michael Noland (joat)
Jason Rogers (dovoto)
@@ -12,7 +12,7 @@
Permission is granted to anyone to use this software for any
purpose, including commercial applications, and to alter it and
redistribute it freely, subject to the following restrictions:
-
+
1. The origin of this software must not be misrepresented; you
must not claim that you wrote the original software. If you use
this software in a product, an acknowledgment in the product
@@ -22,13 +22,151 @@
3. This notice may not be removed or altered from any source
distribution.
$Log$
+ Revision 1.1 2008/04/16 18:37:32 joel
+ 2008-04-16 Matthieu Bucchianeri <mbucchia@gmail.com>
+
+ * ChangeLog, Makefile.am, README, bsp_specs, configure.ac,
+ mk_libnds.sh, patch.libnds, preinstall.am, block/block.c,
+ clock/clock.c, console/console.c, coproc/coproc.S, coproc/coproc.c,
+ coproc/coproc.ld, dswifi/dswifi_license.txt, dswifi/makefile,
+ dswifi/arm7/makefile, dswifi/arm7/source/wifi_arm7.c,
+ dswifi/arm7/source/wifi_arm7.h, dswifi/arm9/makefile,
+ dswifi/arm9/source/sgIP.c, dswifi/arm9/source/sgIP.h,
+ dswifi/arm9/source/sgIP_ARP.c, dswifi/arm9/source/sgIP_ARP.h,
+ dswifi/arm9/source/sgIP_Config.h, dswifi/arm9/source/sgIP_DHCP.c,
+ dswifi/arm9/source/sgIP_DHCP.h, dswifi/arm9/source/sgIP_DNS.c,
+ dswifi/arm9/source/sgIP_DNS.h, dswifi/arm9/source/sgIP_Hub.c,
+ dswifi/arm9/source/sgIP_Hub.h, dswifi/arm9/source/sgIP_ICMP.c,
+ dswifi/arm9/source/sgIP_ICMP.h, dswifi/arm9/source/sgIP_IP.c,
+ dswifi/arm9/source/sgIP_IP.h, dswifi/arm9/source/sgIP_TCP.c,
+ dswifi/arm9/source/sgIP_TCP.h, dswifi/arm9/source/sgIP_UDP.c,
+ dswifi/arm9/source/sgIP_UDP.h, dswifi/arm9/source/sgIP_memblock.c,
+ dswifi/arm9/source/sgIP_memblock.h,
+ dswifi/arm9/source/sgIP_sockets.c, dswifi/arm9/source/sgIP_sockets.h,
+ dswifi/arm9/source/wifi_arm9.c, dswifi/arm9/source/wifi_arm9.h,
+ dswifi/common/source/dsregs.h, dswifi/common/source/spinlock.h,
+ dswifi/common/source/spinlock.s, dswifi/common/source/wifi_shared.h,
+ dswifi/include/dswifi7.h, dswifi/include/dswifi9.h,
+ dswifi/include/dswifi_version.h, dswifi/include/netdb.h,
+ dswifi/include/sgIP_errno.h, dswifi/include/netinet/in.h, fb/fb.c,
+ fb/fb.h, include/bsp.h, include/my_ipc.h, include/tm27.h,
+ include/types.h, include/sys/iosupport.h, irq/irq.c, irq/irq.h,
+ libfat/gba/include/fat.h, libfat/include/fat.h,
+ libfat/nds/include/fat.h, libfat/source/bit_ops.h,
+ libfat/source/cache.c, libfat/source/cache.h, libfat/source/common.h,
+ libfat/source/directory.c, libfat/source/directory.h,
+ libfat/source/fatdir.c, libfat/source/fatdir.h,
+ libfat/source/fatfile.c, libfat/source/fatfile.h,
+ libfat/source/file_allocation_table.c,
+ libfat/source/file_allocation_table.h, libfat/source/filetime.c,
+ libfat/source/filetime.h, libfat/source/libfat.c,
+ libfat/source/mem_allocate.h, libfat/source/partition.c,
+ libfat/source/partition.h, libfat/source/disc_io/disc.c,
+ libfat/source/disc_io/disc.h, libfat/source/disc_io/disc_io.h,
+ libfat/source/disc_io/io_cf_common.c,
+ libfat/source/disc_io/io_cf_common.h,
+ libfat/source/disc_io/io_dldi.h, libfat/source/disc_io/io_dldi.s,
+ libfat/source/disc_io/io_efa2.c, libfat/source/disc_io/io_efa2.h,
+ libfat/source/disc_io/io_fcsr.c, libfat/source/disc_io/io_fcsr.h,
+ libfat/source/disc_io/io_m3_common.c,
+ libfat/source/disc_io/io_m3_common.h,
+ libfat/source/disc_io/io_m3cf.c, libfat/source/disc_io/io_m3cf.h,
+ libfat/source/disc_io/io_m3sd.c, libfat/source/disc_io/io_m3sd.h,
+ libfat/source/disc_io/io_mpcf.c, libfat/source/disc_io/io_mpcf.h,
+ libfat/source/disc_io/io_njsd.c, libfat/source/disc_io/io_njsd.h,
+ libfat/source/disc_io/io_nmmc.c, libfat/source/disc_io/io_nmmc.h,
+ libfat/source/disc_io/io_sc_common.c,
+ libfat/source/disc_io/io_sc_common.h,
+ libfat/source/disc_io/io_sccf.c, libfat/source/disc_io/io_sccf.h,
+ libfat/source/disc_io/io_scsd.c, libfat/source/disc_io/io_scsd.h,
+ libfat/source/disc_io/io_scsd_s.s,
+ libfat/source/disc_io/io_sd_common.c,
+ libfat/source/disc_io/io_sd_common.h, libnds/Makefile.arm7,
+ libnds/Makefile.arm9, libnds/libnds_license.txt,
+ libnds/basicARM7/source/defaultARM7.c,
+ libnds/include/default_font_bin.h, libnds/include/gbfs.h,
+ libnds/include/nds.h, libnds/include/nds/bios.h,
+ libnds/include/nds/card.h, libnds/include/nds/dma.h,
+ libnds/include/nds/interrupts.h, libnds/include/nds/ipc.h,
+ libnds/include/nds/jtypes.h, libnds/include/nds/memory.h,
+ libnds/include/nds/registers_alt.h, libnds/include/nds/reload.h,
+ libnds/include/nds/system.h, libnds/include/nds/timers.h,
+ libnds/include/nds/arm7/audio.h, libnds/include/nds/arm7/clock.h,
+ libnds/include/nds/arm7/serial.h, libnds/include/nds/arm7/touch.h,
+ libnds/include/nds/arm9/background.h,
+ libnds/include/nds/arm9/boxtest.h, libnds/include/nds/arm9/cache.h,
+ libnds/include/nds/arm9/console.h,
+ libnds/include/nds/arm9/exceptions.h,
+ libnds/include/nds/arm9/image.h, libnds/include/nds/arm9/input.h,
+ libnds/include/nds/arm9/math.h, libnds/include/nds/arm9/ndsmotion.h,
+ libnds/include/nds/arm9/pcx.h, libnds/include/nds/arm9/postest.h,
+ libnds/include/nds/arm9/rumble.h, libnds/include/nds/arm9/sound.h,
+ libnds/include/nds/arm9/sprite.h, libnds/include/nds/arm9/trig_lut.h,
+ libnds/include/nds/arm9/video.h, libnds/include/nds/arm9/videoGL.h,
+ libnds/source/arm7/audio.c, libnds/source/arm7/clock.c,
+ libnds/source/arm7/microphone.c, libnds/source/arm7/spi.c,
+ libnds/source/arm7/touch.c, libnds/source/arm7/userSettings.c,
+ libnds/source/arm9/COS.bin, libnds/source/arm9/COS.s,
+ libnds/source/arm9/SIN.bin, libnds/source/arm9/SIN.s,
+ libnds/source/arm9/TAN.bin, libnds/source/arm9/TAN.s,
+ libnds/source/arm9/boxtest.c, libnds/source/arm9/console.c,
+ libnds/source/arm9/dcache.s, libnds/source/arm9/default_font.bin,
+ libnds/source/arm9/default_font.s,
+ libnds/source/arm9/exceptionHandler.S,
+ libnds/source/arm9/exceptionHandler.s,
+ libnds/source/arm9/exceptions.c, libnds/source/arm9/gurumeditation.c,
+ libnds/source/arm9/icache.s, libnds/source/arm9/image.c,
+ libnds/source/arm9/initSystem.c, libnds/source/arm9/keys.c,
+ libnds/source/arm9/ndsmotion.c, libnds/source/arm9/pcx.c,
+ libnds/source/arm9/rumble.c, libnds/source/arm9/sound.c,
+ libnds/source/arm9/system.c, libnds/source/arm9/touch.c,
+ libnds/source/arm9/video.c, libnds/source/arm9/videoGL.c,
+ libnds/source/common/biosCalls.s, libnds/source/common/card.c,
+ libnds/source/common/gbfs.c,
+ libnds/source/common/interruptDispatcher.s,
+ libnds/source/common/interrupts.c, rtc/rtc.c, sound/sound.c,
+ sound/sound.h, start/start.S, startup/linkcmds, startup/start.c,
+ timer/timer.c, tools/Makefile.am, tools/bin2s, tools/bin2s.c,
+ tools/configure.ac, tools/runtest,
+ tools/ndstool/include/arm7_sha1_homebrew.h,
+ tools/ndstool/include/arm7_sha1_nintendo.h,
+ tools/ndstool/include/banner.h, tools/ndstool/include/bigint.h,
+ tools/ndstool/include/crc.h, tools/ndstool/include/default_icon.h,
+ tools/ndstool/include/encryption.h, tools/ndstool/include/header.h,
+ tools/ndstool/include/hook.h, tools/ndstool/include/little.h,
+ tools/ndstool/include/loadme.h, tools/ndstool/include/logo.h,
+ tools/ndstool/include/ndscreate.h,
+ tools/ndstool/include/ndsextract.h, tools/ndstool/include/ndstool.h,
+ tools/ndstool/include/ndstree.h, tools/ndstool/include/overlay.h,
+ tools/ndstool/include/passme.h, tools/ndstool/include/passme_sram.h,
+ tools/ndstool/include/passme_vhd1.h,
+ tools/ndstool/include/passme_vhd2.h, tools/ndstool/include/raster.h,
+ tools/ndstool/include/sha1.h, tools/ndstool/include/types.h,
+ tools/ndstool/source/arm7_sha1_homebrew.c,
+ tools/ndstool/source/arm7_sha1_nintendo.c,
+ tools/ndstool/source/banner.cpp, tools/ndstool/source/bigint.cpp,
+ tools/ndstool/source/compile_date.c, tools/ndstool/source/crc.cpp,
+ tools/ndstool/source/default_icon.c,
+ tools/ndstool/source/encryption.cpp, tools/ndstool/source/header.cpp,
+ tools/ndstool/source/hook.cpp, tools/ndstool/source/loadme.c,
+ tools/ndstool/source/logo.cpp, tools/ndstool/source/ndscodes.cpp,
+ tools/ndstool/source/ndscreate.cpp,
+ tools/ndstool/source/ndsextract.cpp,
+ tools/ndstool/source/ndstool.cpp, tools/ndstool/source/ndstree.cpp,
+ tools/ndstool/source/passme.cpp, tools/ndstool/source/passme_sram.c,
+ tools/ndstool/source/raster.cpp, tools/ndstool/source/sha1.cpp,
+ touchscreen/README.reco, touchscreen/parser.c, touchscreen/reco.c,
+ touchscreen/reco.h, touchscreen/touchscreen.c,
+ touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c:
+ New files.
+
Revision 1.4 2007/02/07 16:38:11 wntrmute
add warioware rumble support
-
+
Revision 1.3 2005/11/27 07:47:07 joatski
Fixed multiple linebreaks.
Moved cart bus control functions and GBA header to memory.h
-
+
Revision 1.2 2005/11/02 07:06:20 bigredpimp
Added revision comment block
@@ -46,7 +184,7 @@ extern "C" {
#define RUMBLE_PAK (*(vuint16 *)0x08000000)
#define WARIOWARE_PAK (*(vuint16 *)0x080000C4)
#define WARIOWARE_ENABLE (*(vuint16 *)0x080000C6)
-
+
typedef enum {
RUMBLE,
WARIOWARE
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/sound.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/sound.h
index 63c76a78a3..43c0c5132b 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/sound.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/sound.h
@@ -24,15 +24,153 @@
distribution.
$Log$
+ Revision 1.1 2008/04/16 18:37:32 joel
+ 2008-04-16 Matthieu Bucchianeri <mbucchia@gmail.com>
+
+ * ChangeLog, Makefile.am, README, bsp_specs, configure.ac,
+ mk_libnds.sh, patch.libnds, preinstall.am, block/block.c,
+ clock/clock.c, console/console.c, coproc/coproc.S, coproc/coproc.c,
+ coproc/coproc.ld, dswifi/dswifi_license.txt, dswifi/makefile,
+ dswifi/arm7/makefile, dswifi/arm7/source/wifi_arm7.c,
+ dswifi/arm7/source/wifi_arm7.h, dswifi/arm9/makefile,
+ dswifi/arm9/source/sgIP.c, dswifi/arm9/source/sgIP.h,
+ dswifi/arm9/source/sgIP_ARP.c, dswifi/arm9/source/sgIP_ARP.h,
+ dswifi/arm9/source/sgIP_Config.h, dswifi/arm9/source/sgIP_DHCP.c,
+ dswifi/arm9/source/sgIP_DHCP.h, dswifi/arm9/source/sgIP_DNS.c,
+ dswifi/arm9/source/sgIP_DNS.h, dswifi/arm9/source/sgIP_Hub.c,
+ dswifi/arm9/source/sgIP_Hub.h, dswifi/arm9/source/sgIP_ICMP.c,
+ dswifi/arm9/source/sgIP_ICMP.h, dswifi/arm9/source/sgIP_IP.c,
+ dswifi/arm9/source/sgIP_IP.h, dswifi/arm9/source/sgIP_TCP.c,
+ dswifi/arm9/source/sgIP_TCP.h, dswifi/arm9/source/sgIP_UDP.c,
+ dswifi/arm9/source/sgIP_UDP.h, dswifi/arm9/source/sgIP_memblock.c,
+ dswifi/arm9/source/sgIP_memblock.h,
+ dswifi/arm9/source/sgIP_sockets.c, dswifi/arm9/source/sgIP_sockets.h,
+ dswifi/arm9/source/wifi_arm9.c, dswifi/arm9/source/wifi_arm9.h,
+ dswifi/common/source/dsregs.h, dswifi/common/source/spinlock.h,
+ dswifi/common/source/spinlock.s, dswifi/common/source/wifi_shared.h,
+ dswifi/include/dswifi7.h, dswifi/include/dswifi9.h,
+ dswifi/include/dswifi_version.h, dswifi/include/netdb.h,
+ dswifi/include/sgIP_errno.h, dswifi/include/netinet/in.h, fb/fb.c,
+ fb/fb.h, include/bsp.h, include/my_ipc.h, include/tm27.h,
+ include/types.h, include/sys/iosupport.h, irq/irq.c, irq/irq.h,
+ libfat/gba/include/fat.h, libfat/include/fat.h,
+ libfat/nds/include/fat.h, libfat/source/bit_ops.h,
+ libfat/source/cache.c, libfat/source/cache.h, libfat/source/common.h,
+ libfat/source/directory.c, libfat/source/directory.h,
+ libfat/source/fatdir.c, libfat/source/fatdir.h,
+ libfat/source/fatfile.c, libfat/source/fatfile.h,
+ libfat/source/file_allocation_table.c,
+ libfat/source/file_allocation_table.h, libfat/source/filetime.c,
+ libfat/source/filetime.h, libfat/source/libfat.c,
+ libfat/source/mem_allocate.h, libfat/source/partition.c,
+ libfat/source/partition.h, libfat/source/disc_io/disc.c,
+ libfat/source/disc_io/disc.h, libfat/source/disc_io/disc_io.h,
+ libfat/source/disc_io/io_cf_common.c,
+ libfat/source/disc_io/io_cf_common.h,
+ libfat/source/disc_io/io_dldi.h, libfat/source/disc_io/io_dldi.s,
+ libfat/source/disc_io/io_efa2.c, libfat/source/disc_io/io_efa2.h,
+ libfat/source/disc_io/io_fcsr.c, libfat/source/disc_io/io_fcsr.h,
+ libfat/source/disc_io/io_m3_common.c,
+ libfat/source/disc_io/io_m3_common.h,
+ libfat/source/disc_io/io_m3cf.c, libfat/source/disc_io/io_m3cf.h,
+ libfat/source/disc_io/io_m3sd.c, libfat/source/disc_io/io_m3sd.h,
+ libfat/source/disc_io/io_mpcf.c, libfat/source/disc_io/io_mpcf.h,
+ libfat/source/disc_io/io_njsd.c, libfat/source/disc_io/io_njsd.h,
+ libfat/source/disc_io/io_nmmc.c, libfat/source/disc_io/io_nmmc.h,
+ libfat/source/disc_io/io_sc_common.c,
+ libfat/source/disc_io/io_sc_common.h,
+ libfat/source/disc_io/io_sccf.c, libfat/source/disc_io/io_sccf.h,
+ libfat/source/disc_io/io_scsd.c, libfat/source/disc_io/io_scsd.h,
+ libfat/source/disc_io/io_scsd_s.s,
+ libfat/source/disc_io/io_sd_common.c,
+ libfat/source/disc_io/io_sd_common.h, libnds/Makefile.arm7,
+ libnds/Makefile.arm9, libnds/libnds_license.txt,
+ libnds/basicARM7/source/defaultARM7.c,
+ libnds/include/default_font_bin.h, libnds/include/gbfs.h,
+ libnds/include/nds.h, libnds/include/nds/bios.h,
+ libnds/include/nds/card.h, libnds/include/nds/dma.h,
+ libnds/include/nds/interrupts.h, libnds/include/nds/ipc.h,
+ libnds/include/nds/jtypes.h, libnds/include/nds/memory.h,
+ libnds/include/nds/registers_alt.h, libnds/include/nds/reload.h,
+ libnds/include/nds/system.h, libnds/include/nds/timers.h,
+ libnds/include/nds/arm7/audio.h, libnds/include/nds/arm7/clock.h,
+ libnds/include/nds/arm7/serial.h, libnds/include/nds/arm7/touch.h,
+ libnds/include/nds/arm9/background.h,
+ libnds/include/nds/arm9/boxtest.h, libnds/include/nds/arm9/cache.h,
+ libnds/include/nds/arm9/console.h,
+ libnds/include/nds/arm9/exceptions.h,
+ libnds/include/nds/arm9/image.h, libnds/include/nds/arm9/input.h,
+ libnds/include/nds/arm9/math.h, libnds/include/nds/arm9/ndsmotion.h,
+ libnds/include/nds/arm9/pcx.h, libnds/include/nds/arm9/postest.h,
+ libnds/include/nds/arm9/rumble.h, libnds/include/nds/arm9/sound.h,
+ libnds/include/nds/arm9/sprite.h, libnds/include/nds/arm9/trig_lut.h,
+ libnds/include/nds/arm9/video.h, libnds/include/nds/arm9/videoGL.h,
+ libnds/source/arm7/audio.c, libnds/source/arm7/clock.c,
+ libnds/source/arm7/microphone.c, libnds/source/arm7/spi.c,
+ libnds/source/arm7/touch.c, libnds/source/arm7/userSettings.c,
+ libnds/source/arm9/COS.bin, libnds/source/arm9/COS.s,
+ libnds/source/arm9/SIN.bin, libnds/source/arm9/SIN.s,
+ libnds/source/arm9/TAN.bin, libnds/source/arm9/TAN.s,
+ libnds/source/arm9/boxtest.c, libnds/source/arm9/console.c,
+ libnds/source/arm9/dcache.s, libnds/source/arm9/default_font.bin,
+ libnds/source/arm9/default_font.s,
+ libnds/source/arm9/exceptionHandler.S,
+ libnds/source/arm9/exceptionHandler.s,
+ libnds/source/arm9/exceptions.c, libnds/source/arm9/gurumeditation.c,
+ libnds/source/arm9/icache.s, libnds/source/arm9/image.c,
+ libnds/source/arm9/initSystem.c, libnds/source/arm9/keys.c,
+ libnds/source/arm9/ndsmotion.c, libnds/source/arm9/pcx.c,
+ libnds/source/arm9/rumble.c, libnds/source/arm9/sound.c,
+ libnds/source/arm9/system.c, libnds/source/arm9/touch.c,
+ libnds/source/arm9/video.c, libnds/source/arm9/videoGL.c,
+ libnds/source/common/biosCalls.s, libnds/source/common/card.c,
+ libnds/source/common/gbfs.c,
+ libnds/source/common/interruptDispatcher.s,
+ libnds/source/common/interrupts.c, rtc/rtc.c, sound/sound.c,
+ sound/sound.h, start/start.S, startup/linkcmds, startup/start.c,
+ timer/timer.c, tools/Makefile.am, tools/bin2s, tools/bin2s.c,
+ tools/configure.ac, tools/runtest,
+ tools/ndstool/include/arm7_sha1_homebrew.h,
+ tools/ndstool/include/arm7_sha1_nintendo.h,
+ tools/ndstool/include/banner.h, tools/ndstool/include/bigint.h,
+ tools/ndstool/include/crc.h, tools/ndstool/include/default_icon.h,
+ tools/ndstool/include/encryption.h, tools/ndstool/include/header.h,
+ tools/ndstool/include/hook.h, tools/ndstool/include/little.h,
+ tools/ndstool/include/loadme.h, tools/ndstool/include/logo.h,
+ tools/ndstool/include/ndscreate.h,
+ tools/ndstool/include/ndsextract.h, tools/ndstool/include/ndstool.h,
+ tools/ndstool/include/ndstree.h, tools/ndstool/include/overlay.h,
+ tools/ndstool/include/passme.h, tools/ndstool/include/passme_sram.h,
+ tools/ndstool/include/passme_vhd1.h,
+ tools/ndstool/include/passme_vhd2.h, tools/ndstool/include/raster.h,
+ tools/ndstool/include/sha1.h, tools/ndstool/include/types.h,
+ tools/ndstool/source/arm7_sha1_homebrew.c,
+ tools/ndstool/source/arm7_sha1_nintendo.c,
+ tools/ndstool/source/banner.cpp, tools/ndstool/source/bigint.cpp,
+ tools/ndstool/source/compile_date.c, tools/ndstool/source/crc.cpp,
+ tools/ndstool/source/default_icon.c,
+ tools/ndstool/source/encryption.cpp, tools/ndstool/source/header.cpp,
+ tools/ndstool/source/hook.cpp, tools/ndstool/source/loadme.c,
+ tools/ndstool/source/logo.cpp, tools/ndstool/source/ndscodes.cpp,
+ tools/ndstool/source/ndscreate.cpp,
+ tools/ndstool/source/ndsextract.cpp,
+ tools/ndstool/source/ndstool.cpp, tools/ndstool/source/ndstree.cpp,
+ tools/ndstool/source/passme.cpp, tools/ndstool/source/passme_sram.c,
+ tools/ndstool/source/raster.cpp, tools/ndstool/source/sha1.cpp,
+ touchscreen/README.reco, touchscreen/parser.c, touchscreen/reco.c,
+ touchscreen/reco.h, touchscreen/touchscreen.c,
+ touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c:
+ New files.
+
Revision 1.3 2005/08/15 03:49:25 wntrmute
export setGenericSound
-
+
Revision 1.2 2005/08/04 17:57:58 wntrmute
playSoundBlock internal only
-
+
Revision 1.1 2005/08/03 05:28:07 wntrmute
added arm9 sound functions
-
+
---------------------------------------------------------------------------------*/
#ifndef _sound_h_
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/sprite.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/sprite.h
index 7e17565080..bbfefad6a3 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/sprite.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/sprite.h
@@ -85,9 +85,9 @@ typedef enum
OBJMODE_BLENDED, /**< Color blending is on - Sprite can use HW blending features. */
OBJMODE_WINDOWED, /**< Sprite can be seen only inside the sprite window. */
OBJMODE_BITMAP, /**< Sprite is not using tiles - per pixel image data. */
-
+
} tObjMode;
-
+
/**
* @enum tObjShape
* @brief Sprite shape mode.
@@ -98,7 +98,7 @@ typedef enum {
OBJSHAPE_TALL, /**< Sprite shape is NxM with N < M (Height > Width). */
OBJSHAPE_FORBIDDEN, /**< Sprite shape is undefined. */
} tObjShape;
-
+
/**
* @enum tObjSize
* @brief Object shape mode.
@@ -134,7 +134,7 @@ typedef enum {
typedef union {
struct {
-
+
struct {
u16 posY :8; /**< Sprite Y position. */
union {
@@ -153,7 +153,7 @@ typedef union {
};
};
};
-
+
union {
struct {
u16 posX :9; /**< Sprite X position. */
@@ -176,21 +176,21 @@ typedef union {
};
};
};
-
+
struct {
u16 tileIdx :10;/**< Upper-left tile index. */
tObjPriority objPriority :2; /**< Sprite priority. */
u8 objPal :4; /**< Sprite palette to use in paletted color modes. */
};
-
+
u16 attribute3; /**< Four of those are used as a sprite rotation matrice */
};
-
+
struct {
uint16 attribute[3];
uint16 filler;
};
-
+
} SpriteEntry, * pSpriteEntry;
@@ -219,6 +219,6 @@ typedef union {
SpriteEntry spriteBuffer[SPRITE_COUNT];
SpriteRotation matrixBuffer[MATRIX_COUNT];
} tOAM;
-
+
#endif // _libnds_sprite_h_
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/trig_lut.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/trig_lut.h
index 5bf31cf818..591b68e3ab 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/trig_lut.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/trig_lut.h
@@ -26,12 +26,150 @@
distribution.
$Log$
+ Revision 1.1 2008/04/16 18:37:32 joel
+ 2008-04-16 Matthieu Bucchianeri <mbucchia@gmail.com>
+
+ * ChangeLog, Makefile.am, README, bsp_specs, configure.ac,
+ mk_libnds.sh, patch.libnds, preinstall.am, block/block.c,
+ clock/clock.c, console/console.c, coproc/coproc.S, coproc/coproc.c,
+ coproc/coproc.ld, dswifi/dswifi_license.txt, dswifi/makefile,
+ dswifi/arm7/makefile, dswifi/arm7/source/wifi_arm7.c,
+ dswifi/arm7/source/wifi_arm7.h, dswifi/arm9/makefile,
+ dswifi/arm9/source/sgIP.c, dswifi/arm9/source/sgIP.h,
+ dswifi/arm9/source/sgIP_ARP.c, dswifi/arm9/source/sgIP_ARP.h,
+ dswifi/arm9/source/sgIP_Config.h, dswifi/arm9/source/sgIP_DHCP.c,
+ dswifi/arm9/source/sgIP_DHCP.h, dswifi/arm9/source/sgIP_DNS.c,
+ dswifi/arm9/source/sgIP_DNS.h, dswifi/arm9/source/sgIP_Hub.c,
+ dswifi/arm9/source/sgIP_Hub.h, dswifi/arm9/source/sgIP_ICMP.c,
+ dswifi/arm9/source/sgIP_ICMP.h, dswifi/arm9/source/sgIP_IP.c,
+ dswifi/arm9/source/sgIP_IP.h, dswifi/arm9/source/sgIP_TCP.c,
+ dswifi/arm9/source/sgIP_TCP.h, dswifi/arm9/source/sgIP_UDP.c,
+ dswifi/arm9/source/sgIP_UDP.h, dswifi/arm9/source/sgIP_memblock.c,
+ dswifi/arm9/source/sgIP_memblock.h,
+ dswifi/arm9/source/sgIP_sockets.c, dswifi/arm9/source/sgIP_sockets.h,
+ dswifi/arm9/source/wifi_arm9.c, dswifi/arm9/source/wifi_arm9.h,
+ dswifi/common/source/dsregs.h, dswifi/common/source/spinlock.h,
+ dswifi/common/source/spinlock.s, dswifi/common/source/wifi_shared.h,
+ dswifi/include/dswifi7.h, dswifi/include/dswifi9.h,
+ dswifi/include/dswifi_version.h, dswifi/include/netdb.h,
+ dswifi/include/sgIP_errno.h, dswifi/include/netinet/in.h, fb/fb.c,
+ fb/fb.h, include/bsp.h, include/my_ipc.h, include/tm27.h,
+ include/types.h, include/sys/iosupport.h, irq/irq.c, irq/irq.h,
+ libfat/gba/include/fat.h, libfat/include/fat.h,
+ libfat/nds/include/fat.h, libfat/source/bit_ops.h,
+ libfat/source/cache.c, libfat/source/cache.h, libfat/source/common.h,
+ libfat/source/directory.c, libfat/source/directory.h,
+ libfat/source/fatdir.c, libfat/source/fatdir.h,
+ libfat/source/fatfile.c, libfat/source/fatfile.h,
+ libfat/source/file_allocation_table.c,
+ libfat/source/file_allocation_table.h, libfat/source/filetime.c,
+ libfat/source/filetime.h, libfat/source/libfat.c,
+ libfat/source/mem_allocate.h, libfat/source/partition.c,
+ libfat/source/partition.h, libfat/source/disc_io/disc.c,
+ libfat/source/disc_io/disc.h, libfat/source/disc_io/disc_io.h,
+ libfat/source/disc_io/io_cf_common.c,
+ libfat/source/disc_io/io_cf_common.h,
+ libfat/source/disc_io/io_dldi.h, libfat/source/disc_io/io_dldi.s,
+ libfat/source/disc_io/io_efa2.c, libfat/source/disc_io/io_efa2.h,
+ libfat/source/disc_io/io_fcsr.c, libfat/source/disc_io/io_fcsr.h,
+ libfat/source/disc_io/io_m3_common.c,
+ libfat/source/disc_io/io_m3_common.h,
+ libfat/source/disc_io/io_m3cf.c, libfat/source/disc_io/io_m3cf.h,
+ libfat/source/disc_io/io_m3sd.c, libfat/source/disc_io/io_m3sd.h,
+ libfat/source/disc_io/io_mpcf.c, libfat/source/disc_io/io_mpcf.h,
+ libfat/source/disc_io/io_njsd.c, libfat/source/disc_io/io_njsd.h,
+ libfat/source/disc_io/io_nmmc.c, libfat/source/disc_io/io_nmmc.h,
+ libfat/source/disc_io/io_sc_common.c,
+ libfat/source/disc_io/io_sc_common.h,
+ libfat/source/disc_io/io_sccf.c, libfat/source/disc_io/io_sccf.h,
+ libfat/source/disc_io/io_scsd.c, libfat/source/disc_io/io_scsd.h,
+ libfat/source/disc_io/io_scsd_s.s,
+ libfat/source/disc_io/io_sd_common.c,
+ libfat/source/disc_io/io_sd_common.h, libnds/Makefile.arm7,
+ libnds/Makefile.arm9, libnds/libnds_license.txt,
+ libnds/basicARM7/source/defaultARM7.c,
+ libnds/include/default_font_bin.h, libnds/include/gbfs.h,
+ libnds/include/nds.h, libnds/include/nds/bios.h,
+ libnds/include/nds/card.h, libnds/include/nds/dma.h,
+ libnds/include/nds/interrupts.h, libnds/include/nds/ipc.h,
+ libnds/include/nds/jtypes.h, libnds/include/nds/memory.h,
+ libnds/include/nds/registers_alt.h, libnds/include/nds/reload.h,
+ libnds/include/nds/system.h, libnds/include/nds/timers.h,
+ libnds/include/nds/arm7/audio.h, libnds/include/nds/arm7/clock.h,
+ libnds/include/nds/arm7/serial.h, libnds/include/nds/arm7/touch.h,
+ libnds/include/nds/arm9/background.h,
+ libnds/include/nds/arm9/boxtest.h, libnds/include/nds/arm9/cache.h,
+ libnds/include/nds/arm9/console.h,
+ libnds/include/nds/arm9/exceptions.h,
+ libnds/include/nds/arm9/image.h, libnds/include/nds/arm9/input.h,
+ libnds/include/nds/arm9/math.h, libnds/include/nds/arm9/ndsmotion.h,
+ libnds/include/nds/arm9/pcx.h, libnds/include/nds/arm9/postest.h,
+ libnds/include/nds/arm9/rumble.h, libnds/include/nds/arm9/sound.h,
+ libnds/include/nds/arm9/sprite.h, libnds/include/nds/arm9/trig_lut.h,
+ libnds/include/nds/arm9/video.h, libnds/include/nds/arm9/videoGL.h,
+ libnds/source/arm7/audio.c, libnds/source/arm7/clock.c,
+ libnds/source/arm7/microphone.c, libnds/source/arm7/spi.c,
+ libnds/source/arm7/touch.c, libnds/source/arm7/userSettings.c,
+ libnds/source/arm9/COS.bin, libnds/source/arm9/COS.s,
+ libnds/source/arm9/SIN.bin, libnds/source/arm9/SIN.s,
+ libnds/source/arm9/TAN.bin, libnds/source/arm9/TAN.s,
+ libnds/source/arm9/boxtest.c, libnds/source/arm9/console.c,
+ libnds/source/arm9/dcache.s, libnds/source/arm9/default_font.bin,
+ libnds/source/arm9/default_font.s,
+ libnds/source/arm9/exceptionHandler.S,
+ libnds/source/arm9/exceptionHandler.s,
+ libnds/source/arm9/exceptions.c, libnds/source/arm9/gurumeditation.c,
+ libnds/source/arm9/icache.s, libnds/source/arm9/image.c,
+ libnds/source/arm9/initSystem.c, libnds/source/arm9/keys.c,
+ libnds/source/arm9/ndsmotion.c, libnds/source/arm9/pcx.c,
+ libnds/source/arm9/rumble.c, libnds/source/arm9/sound.c,
+ libnds/source/arm9/system.c, libnds/source/arm9/touch.c,
+ libnds/source/arm9/video.c, libnds/source/arm9/videoGL.c,
+ libnds/source/common/biosCalls.s, libnds/source/common/card.c,
+ libnds/source/common/gbfs.c,
+ libnds/source/common/interruptDispatcher.s,
+ libnds/source/common/interrupts.c, rtc/rtc.c, sound/sound.c,
+ sound/sound.h, start/start.S, startup/linkcmds, startup/start.c,
+ timer/timer.c, tools/Makefile.am, tools/bin2s, tools/bin2s.c,
+ tools/configure.ac, tools/runtest,
+ tools/ndstool/include/arm7_sha1_homebrew.h,
+ tools/ndstool/include/arm7_sha1_nintendo.h,
+ tools/ndstool/include/banner.h, tools/ndstool/include/bigint.h,
+ tools/ndstool/include/crc.h, tools/ndstool/include/default_icon.h,
+ tools/ndstool/include/encryption.h, tools/ndstool/include/header.h,
+ tools/ndstool/include/hook.h, tools/ndstool/include/little.h,
+ tools/ndstool/include/loadme.h, tools/ndstool/include/logo.h,
+ tools/ndstool/include/ndscreate.h,
+ tools/ndstool/include/ndsextract.h, tools/ndstool/include/ndstool.h,
+ tools/ndstool/include/ndstree.h, tools/ndstool/include/overlay.h,
+ tools/ndstool/include/passme.h, tools/ndstool/include/passme_sram.h,
+ tools/ndstool/include/passme_vhd1.h,
+ tools/ndstool/include/passme_vhd2.h, tools/ndstool/include/raster.h,
+ tools/ndstool/include/sha1.h, tools/ndstool/include/types.h,
+ tools/ndstool/source/arm7_sha1_homebrew.c,
+ tools/ndstool/source/arm7_sha1_nintendo.c,
+ tools/ndstool/source/banner.cpp, tools/ndstool/source/bigint.cpp,
+ tools/ndstool/source/compile_date.c, tools/ndstool/source/crc.cpp,
+ tools/ndstool/source/default_icon.c,
+ tools/ndstool/source/encryption.cpp, tools/ndstool/source/header.cpp,
+ tools/ndstool/source/hook.cpp, tools/ndstool/source/loadme.c,
+ tools/ndstool/source/logo.cpp, tools/ndstool/source/ndscodes.cpp,
+ tools/ndstool/source/ndscreate.cpp,
+ tools/ndstool/source/ndsextract.cpp,
+ tools/ndstool/source/ndstool.cpp, tools/ndstool/source/ndstree.cpp,
+ tools/ndstool/source/passme.cpp, tools/ndstool/source/passme_sram.c,
+ tools/ndstool/source/raster.cpp, tools/ndstool/source/sha1.cpp,
+ touchscreen/README.reco, touchscreen/parser.c, touchscreen/reco.c,
+ touchscreen/reco.h, touchscreen/touchscreen.c,
+ touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c:
+ New files.
+
Revision 1.7 2005/08/23 17:06:10 wntrmute
converted all endings to unix
-
+
Revision 1.6 2005/08/01 23:18:22 wntrmute
adjusted headers for logging
-
+
Revision 1.5 2005/07/29 00:35:52 wntrmute
update file header
reference externs directly
@@ -51,4 +189,4 @@ extern short TAN_bin[];
#define TAN TAN_bin
-#endif
+#endif
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/video.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/video.h
index 723ca41ba0..ff8725676e 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/video.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/video.h
@@ -374,7 +374,7 @@ typedef struct {
u16 ydx;
u16 ydy;
u32 centerX;
- u32 centerY;
+ u32 centerY;
} bg_rotation;
typedef struct {
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/videoGL.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/videoGL.h
index 2e75729759..32c495a56e 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/videoGL.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/arm9/videoGL.h
@@ -29,8 +29,8 @@
---------------------------------------------------------------------------------*/
-/*! \file videoGL.h
-\brief openGL (ish) interface to DS 3D hardware.
+/*! \file videoGL.h
+\brief openGL (ish) interface to DS 3D hardware.
*/
#ifndef VIDEOGL_ARM9_INCLUDE
@@ -141,7 +141,7 @@ typedef struct {
<A HREF="http://nocash.emubase.de/gbatek.htm#ds3dpolygondefinitionsbyvertices">GBATEK http://nocash.emubase.de/gbatek.htm#ds3dpolygondefinitionsbyvertices</A><BR>
related functions: glBegin() */
typedef enum {
- GL_TRIANGLES = 0, /*!< draw triangles with each 3 vertices defining a triangle */
+ GL_TRIANGLES = 0, /*!< draw triangles with each 3 vertices defining a triangle */
GL_QUADS = 1, /*!< draw quads with each 4 vertices defining a quad */
GL_TRIANGLE_STRIP = 2, /*!< draw triangles with the first triangle defined by 3 vertices, then each additional triangle being defined by one additional vertex */
GL_QUAD_STRIP = 3, /*!< draw quads with the first quad being defined by 4 vertices, then each additional triangle being defined by 2 vertices. */
@@ -193,7 +193,7 @@ enum GL_POLY_FORMAT_ENUM {
related functions: glTexImage2d(), glTexParameter() */
enum GL_TEXTURE_SIZE_ENUM {
TEXTURE_SIZE_8 = 0, /*!< 8 texels */
- TEXTURE_SIZE_16 = 1, /*!< 16 texels */
+ TEXTURE_SIZE_16 = 1, /*!< 16 texels */
TEXTURE_SIZE_32 = 2, /*!< 32 texels */
TEXTURE_SIZE_64 = 3, /*!< 64 texels */
TEXTURE_SIZE_128 = 4, /*!< 128 texels */
@@ -280,17 +280,17 @@ much about it. This is only an issue because of hte mix of inlined/real function
---------------------------------------------------------------------------------*/
typedef struct {
GL_MATRIX_MODE_ENUM matrixMode; // holds the current Matrix Mode
-
+
// holds the current state of the clear color register
uint32 clearColor; // state of clear color register
-
+
// texture globals
uint32 textures[MAX_TEXTURES];
uint32 activeTexture;
uint32* nextBlock;
uint32 nextPBlock;
int nameCount;
-
+
} gl_hidden_globals;
// Pointer to global data for videoGL
@@ -380,7 +380,7 @@ void glTexParameter( uint8 sizeX, uint8 sizeY,
/*! \brief Returns the active texture parameter (constructed from internal call to glTexParameter) */
u32 glGetTexParameter(void);
-/*! \brief returns the address alocated to the texure named by name
+/*! \brief returns the address alocated to the texure named by name
\param name the name of the texture to get a pointer to */
void* glGetTexturePointer( int name);
@@ -421,7 +421,7 @@ gl_hidden_globals* glGetGlobals(void);
#ifdef __cplusplus
}
#endif
-
+
@@ -525,7 +525,7 @@ GL_STATIC_INL void glStoreMatrix(int32 index) { MATRIX_STORE = index; }
/*! \brief multiply the current matrix by a translation matrix<BR>
<A HREF="http://nocash.emubase.de/gbatek.htm#ds3dmatrixloadmultiply">GBATEK http://nocash.emubase.de/gbatek.htm#ds3dmatrixloadmultiply</A>
\param v the vector to translate by */
-GL_STATIC_INL void glScalev(const GLvector* v) {
+GL_STATIC_INL void glScalev(const GLvector* v) {
MATRIX_SCALE = v->x;
MATRIX_SCALE = v->y;
MATRIX_SCALE = v->z;
@@ -604,12 +604,12 @@ GL_STATIC_INL void glFlush(uint32 mode) { GFX_FLUSH = mode; }
GL_STATIC_INL void glMaterialShinyness(void) {
uint32 shiny32[128/4];
uint8 *shiny8 = (uint8*)shiny32;
-
+
int i;
-
+
for (i = 0; i < 128 * 2; i += 2)
shiny8[i>>1] = i;
-
+
for (i = 0; i < 128 / 4; i++)
GFX_SHININESS = shiny32[i];
}
@@ -621,14 +621,14 @@ There is sometimes a problem when you pack the GFX_END command into a list, so d
<A HREF="http://nocash.emubase.de/gbatek.htm#ds3dgeometrycommands">GBATEK http://nocash.emubase.de/gbatek.htm#ds3dgeometrycommands</A> */
GL_STATIC_INL void glCallList(const u32* list) {
u32 count = *list++;
-
+
// flush the area that we are going to DMA
DC_FlushRange(list, count*4);
-
+
// don't start DMAing while anything else is being DMAed because FIFO DMA is touchy as hell
// If anyone can explain this better that would be great. -- gabebear
while((DMA_CR(0) & DMA_BUSY)||(DMA_CR(1) & DMA_BUSY)||(DMA_CR(2) & DMA_BUSY)||(DMA_CR(3) & DMA_BUSY));
-
+
// send the packed list asynchronously via DMA to the FIFO
DMA_SRC(0) = (uint32)list;
DMA_DEST(0) = 0x4000400;
@@ -656,17 +656,17 @@ GL_STATIC_INL void glLoadMatrix4x4(const m4x4 *m) {
MATRIX_LOAD4x4 = m->m[1];
MATRIX_LOAD4x4 = m->m[2];
MATRIX_LOAD4x4 = m->m[3];
-
+
MATRIX_LOAD4x4 = m->m[4];
MATRIX_LOAD4x4 = m->m[5];
MATRIX_LOAD4x4 = m->m[6];
MATRIX_LOAD4x4 = m->m[7];
-
+
MATRIX_LOAD4x4 = m->m[8];
MATRIX_LOAD4x4 = m->m[9];
MATRIX_LOAD4x4 = m->m[10];
MATRIX_LOAD4x4 = m->m[11];
-
+
MATRIX_LOAD4x4 = m->m[12];
MATRIX_LOAD4x4 = m->m[13];
MATRIX_LOAD4x4 = m->m[14];
@@ -680,12 +680,12 @@ GL_STATIC_INL void glLoadMatrix4x3(const m4x3 * m) {
MATRIX_LOAD4x3 = m->m[1];
MATRIX_LOAD4x3 = m->m[2];
MATRIX_LOAD4x3 = m->m[3];
-
+
MATRIX_LOAD4x3 = m->m[4];
MATRIX_LOAD4x3 = m->m[5];
MATRIX_LOAD4x3 = m->m[6];
MATRIX_LOAD4x3 = m->m[7];
-
+
MATRIX_LOAD4x3 = m->m[8];
MATRIX_LOAD4x3 = m->m[9];
MATRIX_LOAD4x3 = m->m[10];
@@ -699,17 +699,17 @@ GL_STATIC_INL void glMultMatrix4x4(const m4x4 * m) {
MATRIX_MULT4x4 = m->m[1];
MATRIX_MULT4x4 = m->m[2];
MATRIX_MULT4x4 = m->m[3];
-
+
MATRIX_MULT4x4 = m->m[4];
MATRIX_MULT4x4 = m->m[5];
MATRIX_MULT4x4 = m->m[6];
MATRIX_MULT4x4 = m->m[7];
-
+
MATRIX_MULT4x4 = m->m[8];
MATRIX_MULT4x4 = m->m[9];
MATRIX_MULT4x4 = m->m[10];
MATRIX_MULT4x4 = m->m[11];
-
+
MATRIX_MULT4x4 = m->m[12];
MATRIX_MULT4x4 = m->m[13];
MATRIX_MULT4x4 = m->m[14];
@@ -723,17 +723,17 @@ GL_STATIC_INL void glMultMatrix4x3(const m4x3 * m) {
MATRIX_MULT4x3 = m->m[1];
MATRIX_MULT4x3 = m->m[2];
MATRIX_MULT4x3 = m->m[3];
-
+
MATRIX_MULT4x3 = m->m[4];
MATRIX_MULT4x3 = m->m[5];
MATRIX_MULT4x3 = m->m[6];
MATRIX_MULT4x3 = m->m[7];
-
+
MATRIX_MULT4x3 = m->m[8];
MATRIX_MULT4x3 = m->m[9];
MATRIX_MULT4x3 = m->m[10];
MATRIX_MULT4x3 = m->m[11];
-
+
}
/*! \brief multiplies the current matrix by m
@@ -742,68 +742,68 @@ GL_STATIC_INL void glMultMatrix3x3(const m3x3 * m) {
MATRIX_MULT3x3 = m->m[0];
MATRIX_MULT3x3 = m->m[1];
MATRIX_MULT3x3 = m->m[2];
-
+
MATRIX_MULT3x3 = m->m[3];
MATRIX_MULT3x3 = m->m[4];
MATRIX_MULT3x3 = m->m[5];
-
+
MATRIX_MULT3x3 = m->m[6];
MATRIX_MULT3x3 = m->m[7];
MATRIX_MULT3x3 = m->m[8];
}
-/*! \brief Rotates the current modelview matrix by angle about the x axis
+/*! \brief Rotates the current modelview matrix by angle about the x axis
\param angle The angle to rotate by (angle is 0-511) */
GL_STATIC_INL void glRotateXi(int angle) {
int32 sine = SIN[angle & LUT_MASK];
int32 cosine = COS[angle & LUT_MASK];
-
+
MATRIX_MULT3x3 = inttof32(1);
MATRIX_MULT3x3 = 0;
MATRIX_MULT3x3 = 0;
-
+
MATRIX_MULT3x3 = 0;
MATRIX_MULT3x3 = cosine;
MATRIX_MULT3x3 = sine;
-
+
MATRIX_MULT3x3 = 0;
MATRIX_MULT3x3 = -sine;
MATRIX_MULT3x3 = cosine;
}
-/*! \brief Rotates the current modelview matrix by angle about the y axis
+/*! \brief Rotates the current modelview matrix by angle about the y axis
\param angle The angle to rotate by (angle is 0-511) */
GL_STATIC_INL void glRotateYi(int angle) {
int32 sine = SIN[angle & LUT_MASK];
int32 cosine = COS[angle & LUT_MASK];
-
+
MATRIX_MULT3x3 = cosine;
MATRIX_MULT3x3 = 0;
MATRIX_MULT3x3 = -sine;
-
+
MATRIX_MULT3x3 = 0;
MATRIX_MULT3x3 = inttof32(1);
MATRIX_MULT3x3 = 0;
-
+
MATRIX_MULT3x3 = sine;
MATRIX_MULT3x3 = 0;
MATRIX_MULT3x3 = cosine;
}
-/*! \brief Rotates the current modelview matrix by angle about the z axis
+/*! \brief Rotates the current modelview matrix by angle about the z axis
\param angle The angle to rotate by (angle is 0-511) */
GL_STATIC_INL void glRotateZi(int angle) {
int32 sine = SIN[angle & LUT_MASK];
int32 cosine = COS[angle & LUT_MASK];
-
+
MATRIX_MULT3x3 = cosine;
MATRIX_MULT3x3 = sine;
MATRIX_MULT3x3 = 0;
-
+
MATRIX_MULT3x3 = - sine;
MATRIX_MULT3x3 = cosine;
MATRIX_MULT3x3 = 0;
-
+
MATRIX_MULT3x3 = 0;
MATRIX_MULT3x3 = 0;
MATRIX_MULT3x3 = inttof32(1);
@@ -818,24 +818,24 @@ GL_STATIC_INL void glRotateZi(int angle) {
\param zNear near clipping plane
\param zFar far clipping plane */
GL_STATIC_INL void glOrthof32(int32 left, int32 right, int32 bottom, int32 top, int32 zNear, int32 zFar) {
- MATRIX_MULT4x4 = divf32(inttof32(2), right - left);
- MATRIX_MULT4x4 = 0;
- MATRIX_MULT4x4 = 0;
+ MATRIX_MULT4x4 = divf32(inttof32(2), right - left);
+ MATRIX_MULT4x4 = 0;
+ MATRIX_MULT4x4 = 0;
MATRIX_MULT4x4 = 0;
- MATRIX_MULT4x4 = 0;
- MATRIX_MULT4x4 = divf32(inttof32(2), top - bottom);
- MATRIX_MULT4x4 = 0;
+ MATRIX_MULT4x4 = 0;
+ MATRIX_MULT4x4 = divf32(inttof32(2), top - bottom);
+ MATRIX_MULT4x4 = 0;
MATRIX_MULT4x4 = 0;
- MATRIX_MULT4x4 = 0;
- MATRIX_MULT4x4 = 0;
- MATRIX_MULT4x4 = divf32(inttof32(-2), zFar - zNear);
+ MATRIX_MULT4x4 = 0;
+ MATRIX_MULT4x4 = 0;
+ MATRIX_MULT4x4 = divf32(inttof32(-2), zFar - zNear);
MATRIX_MULT4x4 = 0;
- MATRIX_MULT4x4 = -divf32(right + left, right - left);//0;
- MATRIX_MULT4x4 = -divf32(top + bottom, top - bottom); //0;
- MATRIX_MULT4x4 = -divf32(zFar + zNear, zFar - zNear);//0;
+ MATRIX_MULT4x4 = -divf32(right + left, right - left);//0;
+ MATRIX_MULT4x4 = -divf32(top + bottom, top - bottom); //0;
+ MATRIX_MULT4x4 = -divf32(zFar + zNear, zFar - zNear);//0;
MATRIX_MULT4x4 = floattof32(1.0F);
}
@@ -851,47 +851,47 @@ GL_STATIC_INL void glOrthof32(int32 left, int32 right, int32 bottom, int32 top,
\param upz <upx, upy, upz> Unit vector describing which direction is up for the camera. */
GL_STATIC_INL void gluLookAtf32(int32 eyex, int32 eyey, int32 eyez, int32 lookAtx, int32 lookAty, int32 lookAtz, int32 upx, int32 upy, int32 upz) {
int32 side[3], forward[3], up[3], eye[3];
-
- forward[0] = eyex - lookAtx;
- forward[1] = eyey - lookAty;
- forward[2] = eyez - lookAtz;
-
- normalizef32(forward);
-
- up[0] = upx;
- up[1] = upy;
- up[2] = upz;
- eye[0] = eyex;
- eye[1] = eyey;
- eye[2] = eyez;
-
- crossf32(up, forward, side);
-
- normalizef32(side);
-
+
+ forward[0] = eyex - lookAtx;
+ forward[1] = eyey - lookAty;
+ forward[2] = eyez - lookAtz;
+
+ normalizef32(forward);
+
+ up[0] = upx;
+ up[1] = upy;
+ up[2] = upz;
+ eye[0] = eyex;
+ eye[1] = eyey;
+ eye[2] = eyez;
+
+ crossf32(up, forward, side);
+
+ normalizef32(side);
+
// Recompute local up
crossf32(forward, side, up);
-
- glMatrixMode(GL_MODELVIEW);
-
-
- // should we use MATRIX_MULT4x3?
- MATRIX_MULT4x3 = side[0];
- MATRIX_MULT4x3 = up[0];
- MATRIX_MULT4x3 = forward[0];
-
- MATRIX_MULT4x3 = side[1];
- MATRIX_MULT4x3 = up[1];
- MATRIX_MULT4x3 = forward[1];
-
- MATRIX_MULT4x3 = side[2];
- MATRIX_MULT4x3 = up[2];
- MATRIX_MULT4x3 = forward[2];
-
- MATRIX_MULT4x3 = -dotf32(eye,side);
- MATRIX_MULT4x3 = -dotf32(eye,up);
- MATRIX_MULT4x3 = -dotf32(eye,forward);
-
+
+ glMatrixMode(GL_MODELVIEW);
+
+
+ // should we use MATRIX_MULT4x3?
+ MATRIX_MULT4x3 = side[0];
+ MATRIX_MULT4x3 = up[0];
+ MATRIX_MULT4x3 = forward[0];
+
+ MATRIX_MULT4x3 = side[1];
+ MATRIX_MULT4x3 = up[1];
+ MATRIX_MULT4x3 = forward[1];
+
+ MATRIX_MULT4x3 = side[2];
+ MATRIX_MULT4x3 = up[2];
+ MATRIX_MULT4x3 = forward[2];
+
+ MATRIX_MULT4x3 = -dotf32(eye,side);
+ MATRIX_MULT4x3 = -dotf32(eye,up);
+ MATRIX_MULT4x3 = -dotf32(eye,forward);
+
}
@@ -907,18 +907,18 @@ GL_STATIC_INL void glFrustumf32(int32 left, int32 right, int32 bottom, int32 top
MATRIX_MULT4x4 = 0;
MATRIX_MULT4x4 = divf32(right + left, right - left);
MATRIX_MULT4x4 = 0;
-
+
MATRIX_MULT4x4 = 0;
MATRIX_MULT4x4 = divf32(2*near, top - bottom);
MATRIX_MULT4x4 = divf32(top + bottom, top - bottom);
MATRIX_MULT4x4 = 0;
-
+
MATRIX_MULT4x4 = 0;
MATRIX_MULT4x4 = 0;
MATRIX_MULT4x4 = -divf32(far + near, far - near);
MATRIX_MULT4x4 = floattof32(-1.0F);
MATRIX_MULT4x4 = 0;
-
+
MATRIX_MULT4x4 = 0;
MATRIX_MULT4x4 = -divf32(2 * mulf32(far, near), far - near);
MATRIX_MULT4x4 = 0;
@@ -929,17 +929,17 @@ GL_STATIC_INL void glFrustumf32(int32 left, int32 right, int32 bottom, int32 top
MATRIX_MULT4x4 = 0;
MATRIX_MULT4x4 = 0;
MATRIX_MULT4x4 = 0;
-
+
MATRIX_MULT4x4 = 0;
MATRIX_MULT4x4 = divf32(2*near, top - bottom);
MATRIX_MULT4x4 = 0;
MATRIX_MULT4x4 = 0;
-
+
MATRIX_MULT4x4 = divf32(right + left, right - left);
MATRIX_MULT4x4 = divf32(top + bottom, top - bottom);
MATRIX_MULT4x4 = -divf32(far + near, far - near);
MATRIX_MULT4x4 = floattof32(-1.0F);
-
+
MATRIX_MULT4x4 = 0;
MATRIX_MULT4x4 = 0;
MATRIX_MULT4x4 = -divf32(2 * mulf32(far, near), far - near);
@@ -948,18 +948,18 @@ GL_STATIC_INL void glFrustumf32(int32 left, int32 right, int32 bottom, int32 top
}
/*! \brief Utility function which sets up the projection matrix (fixed point version)
-\param fovy Specifies the field of view in degrees (0 -511)
+\param fovy Specifies the field of view in degrees (0 -511)
\param aspect Specifies the aspect ratio of the screen (normally screen width/screen height)
\param zNear Specifies the near clipping plane
\param zFar Specifies the far clipping plane */
GL_STATIC_INL void gluPerspectivef32(int fovy, int32 aspect, int32 zNear, int32 zFar) {
int32 xmin, xmax, ymin, ymax;
-
+
ymax = mulf32(zNear, TAN[(fovy>>1) & LUT_MASK]);
ymin = -ymax;
xmin = mulf32(ymin, aspect);
xmax = mulf32(ymax, aspect);
-
+
glFrustumf32(xmin, xmax, ymin, ymax, zNear, zFar);
}
@@ -994,17 +994,17 @@ GL_STATIC_INL void glResetMatrixStack(void) {
while(GFX_STATUS & BIT(14)){
GFX_STATUS |= 1 << 15; // clear push/pop errors or push/pop busy bit never clears
}
-
+
// pop the projection stack to the top; poping 0 off an empty stack causes an error... weird?
if((GFX_STATUS&(1<<13))!=0) {
glMatrixMode(GL_PROJECTION);
glPopMatrix(1);
}
-
+
// 31 deep modelview matrix; 32nd entry works but sets error flag
glMatrixMode(GL_MODELVIEW);
glPopMatrix((GFX_STATUS >> 8) & 0x1F);
-
+
// load identity to all the matrices
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
@@ -1014,12 +1014,12 @@ GL_STATIC_INL void glResetMatrixStack(void) {
glLoadIdentity();
}
-/*! \brief Specifies an edge color for polygons
+/*! \brief Specifies an edge color for polygons
\param id which outline color to set (0-7)
\param color the 15bit color to set */
GL_STATIC_INL void glSetOutlineColor(int id, rgb color) { GFX_EDGE_TABLE[id] = color; }
-/*! \brief Loads a toon table
+/*! \brief Loads a toon table
\param pointer to the 32 color palette to load into the toon table*/
GL_STATIC_INL void glSetToonTable(const uint16 *table) {
int i;
@@ -1069,7 +1069,7 @@ GL_STATIC_INL void glGetFixed(const GL_GET_ENUM param, int32* f) {
for(i = 0; i < 16; i++) f[i] = MATRIX_READ_CLIP[i]; // read out the position matrix
glPopMatrix(1); // restore the projection matrix
break;
- default:
+ default:
break;
}
}
@@ -1272,12 +1272,12 @@ GL_STATIC_INL void glFrustum(float left, float right, float bottom, float top, f
/*! \brief Utility function which sets up the projection matrix (floating point version)
\warning FLOAT VERSION!!!! please use gluPerspectivef32()
-\param fovy Specifies the field of view in degrees
+\param fovy Specifies the field of view in degrees
\param aspect Specifies the aspect ratio of the screen (normally screen width/screen height)
\param zNear Specifies the near clipping plane
\param zFar Specifies the far clipping plane */
GL_STATIC_INL void gluPerspective(float fovy, float aspect, float zNear, float zFar) {
- gluPerspectivef32((int)(fovy * LUT_SIZE / 360.0), floattof32(aspect), floattof32(zNear), floattof32(zFar));
+ gluPerspectivef32((int)(fovy * LUT_SIZE / 360.0), floattof32(aspect), floattof32(zNear), floattof32(zFar));
}
/*! \brief Sets texture coordinates for following vertices<BR>
@@ -1286,9 +1286,9 @@ GL_STATIC_INL void gluPerspective(float fovy, float aspect, float zNear, float z
\param s S(a.k.a. U) texture coordinate (0.0 - 1.0)
\param t T(a.k.a. V) texture coordinate (0.0 - 1.0)*/
GL_STATIC_INL void glTexCoord2f(float s, float t) {
- int x = ((glGlob->textures[glGlob->activeTexture]) >> 20) & 7;
- int y = ((glGlob->textures[glGlob->activeTexture]) >> 23) & 7;
-
+ int x = ((glGlob->textures[glGlob->activeTexture]) >> 20) & 7;
+ int y = ((glGlob->textures[glGlob->activeTexture]) >> 23) & 7;
+
glTexCoord2t16(floattot16(s*(8 << x)), floattot16(t*(8<<y)));
}
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/card.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/card.h
index 3c4a732629..0e4a19780e 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/card.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/card.h
@@ -95,10 +95,10 @@ void cardWriteEeprom(uint32 address, uint8 *data, uint32 length, uint32 addrtype
// Returns the ID of the EEPROM chip? Doesn't work well, most chips give ff,ff
// i = 0 or 1
-uint8 cardEepromReadID(uint8 i);
+uint8 cardEepromReadID(uint8 i);
// Sends a command to the EEPROM
-uint8 cardEepromCommand(uint8 command, uint32 address);
+uint8 cardEepromCommand(uint8 command, uint32 address);
/*
* -1:no card or no EEPROM
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/interrupts.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/interrupts.h
index 57d21fbc88..b5462926f5 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/interrupts.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/interrupts.h
@@ -132,7 +132,7 @@ struct IntTable{IntFn handler; u32 mask;};
Call this function at the start of any application which requires interrupt support.
This function should be used in preference to irqInitHandler.
-
+
*/
void irqInit(void);
/*! \fn irqSet(IRQ_MASK irq, VoidFunctionPointer handler)
@@ -160,7 +160,7 @@ void irqClear(IRQ_MASK irq);
This function installs the main interrupt function, all interrupts are serviced through this routine. For most
purposes the libnds interrupt dispacther should be used in preference to user code unless you know *exactly* what you're doing.
-
+
\param handler Address of the function to use as an interrupt dispatcher
\note the function *must* be ARM code
*/
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/registers_alt.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/registers_alt.h
index 32cc36b04d..1178f3f32f 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/registers_alt.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/registers_alt.h
@@ -28,7 +28,7 @@
/*
This file should be deprecated.
-
+
All hardware register defines should be replaced with REG_ for consistency and namespacing
http://forum.gbadev.org/viewtopic.php?t=4993
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/reload.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/reload.h
index de19c2c08b..c95ae3aaa4 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/reload.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/reload.h
@@ -34,11 +34,11 @@
#ifndef _NDS_LOAD_H_
#define _NDS_LOAD_H_
-
-
+
+
typedef void __attribute__ ((long_call)) (*COPYFUNC)(const char*);
typedef u32 __attribute__ ((long_call)) (*QUERYFUNC)(u32);
-
+
typedef struct {
u32 VERSION; // contains version information about loader
QUERYFUNC QUERY; // used to retreive extended information from loader
@@ -47,33 +47,33 @@ typedef struct {
const char *PATH; // THIS VALUE IS SET FOR YOU, DONT TOUCH IT
u32 RESERVED; // reserved for future expansion
} LOADER_DATA;
-
+
#define LOADNDS ((volatile LOADER_DATA*)(0x02800000-48))
#define BOOT_NDS ((const char*)-1)
-
-
-
+
+
+
/*
dump this near the begining of your ARM7's main function
-
+
LOADNDS->PATH = 0;
-
-
+
+
inside of your ARM7's main loop or VBlank IRQ or what-ever, add this code:
-
+
if (LOADNDS->PATH != 0) {
LOADNDS->ARM7FUNC(LOADNDS->PATH);
}
-
-
+
+
//////////////////////////////////////
-
+
in your ARM9 code, to return to the menu, call this function:
-
+
WAIT_CR &= ~0x8080;
LOADNDS->ARM9FUNC(BOOT_NDS);
-
+
*/
-
-
+
+
#endif //_NDS_LOAD_H_
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/system.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/system.h
index 0684c6faf9..3d22cd21e4 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/system.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/system.h
@@ -211,7 +211,7 @@ typedef struct tPERSONAL_DATA {
unsigned settingsLost : 1; //!< User Settings Lost (0=Normal, 1=Prompt/Settings Lost)
unsigned RESERVED2 : 6; //!< ???
} _user_data;
-
+
u16 RESERVED3;
u32 rtcOffset;
u32 RESERVED4;
@@ -236,7 +236,7 @@ typedef struct tPERSONAL_DATA {
*/
struct __argv {
- int argvMagic; //!< argv magic number, set to 0x5f617267 ('_arg') if valid
+ int argvMagic; //!< argv magic number, set to 0x5f617267 ('_arg') if valid
char *commandLine; //!< base address of command line, set of null terminated strings
int length; //!< total length of command line
};
diff --git a/c/src/lib/libbsp/arm/nds/libnds/include/nds/timers.h b/c/src/lib/libbsp/arm/nds/libnds/include/nds/timers.h
index 39951d33ca..2ac29fc4c7 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/include/nds/timers.h
+++ b/c/src/lib/libbsp/arm/nds/libnds/include/nds/timers.h
@@ -32,7 +32,7 @@
The timers are fed with a 33.4 MHz source on the ARM9. The ARM7
timing hasn't been tested yet, but is likely to be the same.
*/
-
+
//---------------------------------------------------------------------------------
#ifndef NDS_TIMERS_INCLUDE
#define NDS_TIMERS_INCLUDE
@@ -61,15 +61,15 @@ extern "C" {
Clock divider is controlled by %TIMER_CR(n) \n
\n
<b>Example Usage:</b>
-
- %TIMER_DATA(0) = %TIMER_FREQ(freq_in_hz); \n
+
+ %TIMER_DATA(0) = %TIMER_FREQ(freq_in_hz); \n
%TIMER_CR(0) = %TIMER_DIV1 | %TIMER_ENABLE; \n
\n
Max frequency is: 33554432Hz\n
Min frequency is: 512Hz\n
*/
#define TIMER_FREQ(n) (-0x2000000/(n))
-
+
//! A macro that calculates %TIMER_DATA(n) settings for a given frequency of n.
/*! Use the appropriate macro depending on clock divider: \n
<ul>
@@ -83,13 +83,13 @@ extern "C" {
Clock divider is controlled by %TIMER_CR(n) \n
\n
<b>Example Usage:</b>
- %TIMER_DATA(x) = %TIMER_FREQ_64(freq_in_hz)\n
+ %TIMER_DATA(x) = %TIMER_FREQ_64(freq_in_hz)\n
\n
Max frequency is: 524288Hz\n
Min frequency is: 8Hz\n
*/
#define TIMER_FREQ_64(n) (-(0x2000000>>6)/(n))
-
+
//! A macro that calculates %TIMER_DATA(n) settings for a given frequency of n.
/*! Use the appropriate macro depending on clock divider: \n
<ul>
@@ -102,13 +102,13 @@ extern "C" {
Clock divider is controlled by %TIMER_CR(n) \n
\n
<b>Example Usage:</b>
- %TIMER_DATA(x) = %TIMER_FREQ_256(freq_in_hz)\n
+ %TIMER_DATA(x) = %TIMER_FREQ_256(freq_in_hz)\n
\n
Max frequency is: 131072Hz\n
Min frequency is: 2Hz\n
*/
#define TIMER_FREQ_256(n) (-(0x2000000>>8)/(n))
-
+
//! A macro that calculates %TIMER_DATA(n) settings for a given frequency of n.
/*! Use the appropriate macro depending on clock divider: \n
<ul>
@@ -121,7 +121,7 @@ extern "C" {
Clock divider is controlled by %TIMER_CR(n) \n
\n
<b>Example Usage:</b>
- %TIMER_DATA(x) = %TIMER_FREQ_1024(freq_in_hz)\n
+ %TIMER_DATA(x) = %TIMER_FREQ_1024(freq_in_hz)\n
\n
Max frequency is: 32768Hz\n
Min frequency is: 0.5Hz\n
@@ -166,13 +166,13 @@ extern "C" {
/*! <b>Example Usage:</b> %TIMER_CR(x) = %TIMER_ENABLE | %TIMER_DIV_64; \n
\n
Possible bit defines: \n
-
- \see TIMER_ENABLE
- \see TIMER_IRQ_REQ
- \see TIMER_DIV_1
- \see TIMER_DIV_64
- \see TIMER_DIV_256
- \see TIMER_DIV_1024
+
+ \see TIMER_ENABLE
+ \see TIMER_IRQ_REQ
+ \see TIMER_DIV_1
+ \see TIMER_DIV_64
+ \see TIMER_DIV_256
+ \see TIMER_DIV_1024
*/
#define TIMER_CR(n) (*(vuint16*)(0x04000102+((n)<<2)))
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/arm7/clock.c b/c/src/lib/libbsp/arm/nds/libnds/source/arm7/clock.c
index 78727af35c..b8e7adbccd 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/arm7/clock.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/arm7/clock.c
@@ -171,7 +171,7 @@ void rtcGetTimeAndDate(uint8 * time) {
void rtcSetTimeAndDate(uint8 * time) {
//---------------------------------------------------------------------------------
uint8 command[8];
-
+
int i;
for ( i=0; i< 8; i++ ) {
command[i+1] = time[i];
@@ -204,7 +204,7 @@ void rtcGetTime(uint8 * time) {
void rtcSetTime(uint8 * time) {
//---------------------------------------------------------------------------------
uint8 command[4];
-
+
int i;
for ( i=0; i< 3; i++ ) {
command[i+1] = time[i];
@@ -226,7 +226,7 @@ void syncRTC() {
}
}
}
-
+
IPC->unixTime++;
}
@@ -246,11 +246,11 @@ void initClockIRQ() {
command[0] = WRITE_STATUS_REG2;
command[1] = 0x41;
rtcTransaction(command, 2, 0, 0);
-
+
command[0] = WRITE_INT_REG1;
command[1] = 0x01;
rtcTransaction(command, 2, 0, 0);
-
+
command[0] = WRITE_INT_REG2;
command[1] = 0x00;
command[2] = 0x21;
@@ -270,9 +270,9 @@ void initClockIRQ() {
currentTime.tm_mday = IPC->time.rtc.day;
currentTime.tm_mon = IPC->time.rtc.month - 1;
currentTime.tm_year = IPC->time.rtc.year + 100;
-
+
currentTime.tm_isdst = -1;
-
+
IPC->unixTime = mktime(&currentTime);
}
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/arm7/touch.c b/c/src/lib/libbsp/arm/nds/libnds/source/arm7/touch.c
index 11c25cb03c..a62b6bf8b4 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/arm7/touch.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/arm7/touch.c
@@ -94,7 +94,7 @@ uint16 touchRead(uint32 command) {
uint32 oldIME = REG_IME;
REG_IME = 0;
-
+
SerialWaitBusy();
// Write the command and wait for it to complete
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/arm7/userSettings.c b/c/src/lib/libbsp/arm/nds/libnds/source/arm7/userSettings.c
index 8e92cb2b79..4aa7a8f7e8 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/arm7/userSettings.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/arm7/userSettings.c
@@ -39,10 +39,10 @@ void readUserSettings() {
uint32 userSettingsBase;
readFirmware( 0x20, &userSettingsBase,2);
-
+
uint32 slot1Address = userSettingsBase * 8;
uint32 slot2Address = userSettingsBase * 8 + 0x100;
-
+
readFirmware( slot1Address , &slot1, sizeof(PERSONAL_DATA));
readFirmware( slot2Address , &slot2, sizeof(PERSONAL_DATA));
readFirmware( slot1Address + 0x70, &slot1count, 2);
@@ -52,20 +52,20 @@ void readUserSettings() {
// default to slot 1 user Settings
void *currentSettings = &slot1;
-
+
short calc1CRC = swiCRC16( 0xffff, &slot1, sizeof(PERSONAL_DATA));
short calc2CRC = swiCRC16( 0xffff, &slot2, sizeof(PERSONAL_DATA));
// bail out if neither slot is valid
if ( calc1CRC != slot1CRC && calc2CRC != slot2CRC) return;
-
+
// if both slots are valid pick the most recent
- if ( calc1CRC == slot1CRC && calc2CRC == slot2CRC ) {
+ if ( calc1CRC == slot1CRC && calc2CRC == slot2CRC ) {
currentSettings = (slot2count == (( slot2count + 1 ) & 0x7f) ? &slot2 : &slot1);
} else {
if ( calc2CRC == slot2CRC )
currentSettings = &slot2;
}
memcpy ( PersonalData, currentSettings, sizeof(PERSONAL_DATA));
-
+
}
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/boxtest.c b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/boxtest.c
index 47b44369c3..d88ffeddb5 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/boxtest.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/boxtest.c
@@ -83,6 +83,6 @@ int BoxTest(v16 x, v16 y, v16 z, v16 width, v16 height, v16 depth)
int BoxTestf(float x, float y, float z, float width, float height, float depth)
//---------------------------------------------------------------------------------
{
- return BoxTest(floattov16(x), floattov16(y), floattov16(z),
+ return BoxTest(floattov16(x), floattov16(y), floattov16(z),
floattov16(width), floattov16(height), floattov16(depth));
}
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/console.c b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/console.c
index f9ae38de45..6f03a9383b 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/console.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/console.c
@@ -83,7 +83,7 @@ static void consoleCls(char mode) {
col = colTemp;
row = rowTemp;
break;
- }
+ }
case '1':
{
colTemp = col;
@@ -97,7 +97,7 @@ static void consoleCls(char mode) {
col = colTemp;
row = rowTemp;
break;
- }
+ }
case '2':
{
row = 0;
@@ -108,7 +108,7 @@ static void consoleCls(char mode) {
row = 0;
col = 0;
break;
- }
+ }
}
}
//---------------------------------------------------------------------------------
@@ -131,7 +131,7 @@ static void consoleClearLine(char mode) {
col = colTemp;
break;
- }
+ }
case '1':
{
colTemp = col;
@@ -145,7 +145,7 @@ static void consoleClearLine(char mode) {
col = colTemp;
break;
- }
+ }
case '2':
{
colTemp = col;
@@ -202,7 +202,7 @@ int con_write(struct _reent *r,int fd,const char *ptr,int len) {
chr = *(tmp++);
i++; count++; escapelen++;
int parameter;
-
+
switch (chr) {
/////////////////////////////////////////
// Cursor directional movement
@@ -374,12 +374,12 @@ void consoleInit( u16* font, u16* charBase,
}
//---------------------------------------------------------------------------------
-// Places the console in a default mode using bg0 of the sub display, and vram c for
+// Places the console in a default mode using bg0 of the sub display, and vram c for
// font and map..this is provided for rapid prototyping and nothing more
void consoleDemoInit(void) {
//---------------------------------------------------------------------------------
videoSetModeSub(MODE_0_2D | DISPLAY_BG0_ACTIVE); //sub bg 0 will be used to print text
- vramSetBankC(VRAM_C_SUB_BG);
+ vramSetBankC(VRAM_C_SUB_BG);
SUB_BG0_CR = BG_MAP_BASE(31);
@@ -430,7 +430,7 @@ void consolePrintChar(char c) {
The only special characters we will handle are tab (\t), carriage return (\r) & line feed (\n).
Carriage return & line feed will function the same: go to next line and put cursor at the beginning.
For everything else, use VT sequences.
-
+
Reason: VT sequences are more specific to the task of cursor placement.
The special escape sequences \b \f & \v are archaic and non-portable.
*/
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/gurumeditation.c b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/gurumeditation.c
index 5f0bc15786..5420de9d12 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/gurumeditation.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/gurumeditation.c
@@ -236,7 +236,7 @@ static void defaultHandler(void) {
exceptionAddress = getExceptionAddress( codeAddress, thumbState);
else
exceptionAddress = codeAddress;
-
+
} else {
if (thumbState)
offset = 2;
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/image.c b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/image.c
index 410a37c1c9..c2de69ee94 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/image.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/image.c
@@ -25,16 +25,154 @@
distribution.
$Log$
+ Revision 1.1 2008/04/16 18:37:32 joel
+ 2008-04-16 Matthieu Bucchianeri <mbucchia@gmail.com>
+
+ * ChangeLog, Makefile.am, README, bsp_specs, configure.ac,
+ mk_libnds.sh, patch.libnds, preinstall.am, block/block.c,
+ clock/clock.c, console/console.c, coproc/coproc.S, coproc/coproc.c,
+ coproc/coproc.ld, dswifi/dswifi_license.txt, dswifi/makefile,
+ dswifi/arm7/makefile, dswifi/arm7/source/wifi_arm7.c,
+ dswifi/arm7/source/wifi_arm7.h, dswifi/arm9/makefile,
+ dswifi/arm9/source/sgIP.c, dswifi/arm9/source/sgIP.h,
+ dswifi/arm9/source/sgIP_ARP.c, dswifi/arm9/source/sgIP_ARP.h,
+ dswifi/arm9/source/sgIP_Config.h, dswifi/arm9/source/sgIP_DHCP.c,
+ dswifi/arm9/source/sgIP_DHCP.h, dswifi/arm9/source/sgIP_DNS.c,
+ dswifi/arm9/source/sgIP_DNS.h, dswifi/arm9/source/sgIP_Hub.c,
+ dswifi/arm9/source/sgIP_Hub.h, dswifi/arm9/source/sgIP_ICMP.c,
+ dswifi/arm9/source/sgIP_ICMP.h, dswifi/arm9/source/sgIP_IP.c,
+ dswifi/arm9/source/sgIP_IP.h, dswifi/arm9/source/sgIP_TCP.c,
+ dswifi/arm9/source/sgIP_TCP.h, dswifi/arm9/source/sgIP_UDP.c,
+ dswifi/arm9/source/sgIP_UDP.h, dswifi/arm9/source/sgIP_memblock.c,
+ dswifi/arm9/source/sgIP_memblock.h,
+ dswifi/arm9/source/sgIP_sockets.c, dswifi/arm9/source/sgIP_sockets.h,
+ dswifi/arm9/source/wifi_arm9.c, dswifi/arm9/source/wifi_arm9.h,
+ dswifi/common/source/dsregs.h, dswifi/common/source/spinlock.h,
+ dswifi/common/source/spinlock.s, dswifi/common/source/wifi_shared.h,
+ dswifi/include/dswifi7.h, dswifi/include/dswifi9.h,
+ dswifi/include/dswifi_version.h, dswifi/include/netdb.h,
+ dswifi/include/sgIP_errno.h, dswifi/include/netinet/in.h, fb/fb.c,
+ fb/fb.h, include/bsp.h, include/my_ipc.h, include/tm27.h,
+ include/types.h, include/sys/iosupport.h, irq/irq.c, irq/irq.h,
+ libfat/gba/include/fat.h, libfat/include/fat.h,
+ libfat/nds/include/fat.h, libfat/source/bit_ops.h,
+ libfat/source/cache.c, libfat/source/cache.h, libfat/source/common.h,
+ libfat/source/directory.c, libfat/source/directory.h,
+ libfat/source/fatdir.c, libfat/source/fatdir.h,
+ libfat/source/fatfile.c, libfat/source/fatfile.h,
+ libfat/source/file_allocation_table.c,
+ libfat/source/file_allocation_table.h, libfat/source/filetime.c,
+ libfat/source/filetime.h, libfat/source/libfat.c,
+ libfat/source/mem_allocate.h, libfat/source/partition.c,
+ libfat/source/partition.h, libfat/source/disc_io/disc.c,
+ libfat/source/disc_io/disc.h, libfat/source/disc_io/disc_io.h,
+ libfat/source/disc_io/io_cf_common.c,
+ libfat/source/disc_io/io_cf_common.h,
+ libfat/source/disc_io/io_dldi.h, libfat/source/disc_io/io_dldi.s,
+ libfat/source/disc_io/io_efa2.c, libfat/source/disc_io/io_efa2.h,
+ libfat/source/disc_io/io_fcsr.c, libfat/source/disc_io/io_fcsr.h,
+ libfat/source/disc_io/io_m3_common.c,
+ libfat/source/disc_io/io_m3_common.h,
+ libfat/source/disc_io/io_m3cf.c, libfat/source/disc_io/io_m3cf.h,
+ libfat/source/disc_io/io_m3sd.c, libfat/source/disc_io/io_m3sd.h,
+ libfat/source/disc_io/io_mpcf.c, libfat/source/disc_io/io_mpcf.h,
+ libfat/source/disc_io/io_njsd.c, libfat/source/disc_io/io_njsd.h,
+ libfat/source/disc_io/io_nmmc.c, libfat/source/disc_io/io_nmmc.h,
+ libfat/source/disc_io/io_sc_common.c,
+ libfat/source/disc_io/io_sc_common.h,
+ libfat/source/disc_io/io_sccf.c, libfat/source/disc_io/io_sccf.h,
+ libfat/source/disc_io/io_scsd.c, libfat/source/disc_io/io_scsd.h,
+ libfat/source/disc_io/io_scsd_s.s,
+ libfat/source/disc_io/io_sd_common.c,
+ libfat/source/disc_io/io_sd_common.h, libnds/Makefile.arm7,
+ libnds/Makefile.arm9, libnds/libnds_license.txt,
+ libnds/basicARM7/source/defaultARM7.c,
+ libnds/include/default_font_bin.h, libnds/include/gbfs.h,
+ libnds/include/nds.h, libnds/include/nds/bios.h,
+ libnds/include/nds/card.h, libnds/include/nds/dma.h,
+ libnds/include/nds/interrupts.h, libnds/include/nds/ipc.h,
+ libnds/include/nds/jtypes.h, libnds/include/nds/memory.h,
+ libnds/include/nds/registers_alt.h, libnds/include/nds/reload.h,
+ libnds/include/nds/system.h, libnds/include/nds/timers.h,
+ libnds/include/nds/arm7/audio.h, libnds/include/nds/arm7/clock.h,
+ libnds/include/nds/arm7/serial.h, libnds/include/nds/arm7/touch.h,
+ libnds/include/nds/arm9/background.h,
+ libnds/include/nds/arm9/boxtest.h, libnds/include/nds/arm9/cache.h,
+ libnds/include/nds/arm9/console.h,
+ libnds/include/nds/arm9/exceptions.h,
+ libnds/include/nds/arm9/image.h, libnds/include/nds/arm9/input.h,
+ libnds/include/nds/arm9/math.h, libnds/include/nds/arm9/ndsmotion.h,
+ libnds/include/nds/arm9/pcx.h, libnds/include/nds/arm9/postest.h,
+ libnds/include/nds/arm9/rumble.h, libnds/include/nds/arm9/sound.h,
+ libnds/include/nds/arm9/sprite.h, libnds/include/nds/arm9/trig_lut.h,
+ libnds/include/nds/arm9/video.h, libnds/include/nds/arm9/videoGL.h,
+ libnds/source/arm7/audio.c, libnds/source/arm7/clock.c,
+ libnds/source/arm7/microphone.c, libnds/source/arm7/spi.c,
+ libnds/source/arm7/touch.c, libnds/source/arm7/userSettings.c,
+ libnds/source/arm9/COS.bin, libnds/source/arm9/COS.s,
+ libnds/source/arm9/SIN.bin, libnds/source/arm9/SIN.s,
+ libnds/source/arm9/TAN.bin, libnds/source/arm9/TAN.s,
+ libnds/source/arm9/boxtest.c, libnds/source/arm9/console.c,
+ libnds/source/arm9/dcache.s, libnds/source/arm9/default_font.bin,
+ libnds/source/arm9/default_font.s,
+ libnds/source/arm9/exceptionHandler.S,
+ libnds/source/arm9/exceptionHandler.s,
+ libnds/source/arm9/exceptions.c, libnds/source/arm9/gurumeditation.c,
+ libnds/source/arm9/icache.s, libnds/source/arm9/image.c,
+ libnds/source/arm9/initSystem.c, libnds/source/arm9/keys.c,
+ libnds/source/arm9/ndsmotion.c, libnds/source/arm9/pcx.c,
+ libnds/source/arm9/rumble.c, libnds/source/arm9/sound.c,
+ libnds/source/arm9/system.c, libnds/source/arm9/touch.c,
+ libnds/source/arm9/video.c, libnds/source/arm9/videoGL.c,
+ libnds/source/common/biosCalls.s, libnds/source/common/card.c,
+ libnds/source/common/gbfs.c,
+ libnds/source/common/interruptDispatcher.s,
+ libnds/source/common/interrupts.c, rtc/rtc.c, sound/sound.c,
+ sound/sound.h, start/start.S, startup/linkcmds, startup/start.c,
+ timer/timer.c, tools/Makefile.am, tools/bin2s, tools/bin2s.c,
+ tools/configure.ac, tools/runtest,
+ tools/ndstool/include/arm7_sha1_homebrew.h,
+ tools/ndstool/include/arm7_sha1_nintendo.h,
+ tools/ndstool/include/banner.h, tools/ndstool/include/bigint.h,
+ tools/ndstool/include/crc.h, tools/ndstool/include/default_icon.h,
+ tools/ndstool/include/encryption.h, tools/ndstool/include/header.h,
+ tools/ndstool/include/hook.h, tools/ndstool/include/little.h,
+ tools/ndstool/include/loadme.h, tools/ndstool/include/logo.h,
+ tools/ndstool/include/ndscreate.h,
+ tools/ndstool/include/ndsextract.h, tools/ndstool/include/ndstool.h,
+ tools/ndstool/include/ndstree.h, tools/ndstool/include/overlay.h,
+ tools/ndstool/include/passme.h, tools/ndstool/include/passme_sram.h,
+ tools/ndstool/include/passme_vhd1.h,
+ tools/ndstool/include/passme_vhd2.h, tools/ndstool/include/raster.h,
+ tools/ndstool/include/sha1.h, tools/ndstool/include/types.h,
+ tools/ndstool/source/arm7_sha1_homebrew.c,
+ tools/ndstool/source/arm7_sha1_nintendo.c,
+ tools/ndstool/source/banner.cpp, tools/ndstool/source/bigint.cpp,
+ tools/ndstool/source/compile_date.c, tools/ndstool/source/crc.cpp,
+ tools/ndstool/source/default_icon.c,
+ tools/ndstool/source/encryption.cpp, tools/ndstool/source/header.cpp,
+ tools/ndstool/source/hook.cpp, tools/ndstool/source/loadme.c,
+ tools/ndstool/source/logo.cpp, tools/ndstool/source/ndscodes.cpp,
+ tools/ndstool/source/ndscreate.cpp,
+ tools/ndstool/source/ndsextract.cpp,
+ tools/ndstool/source/ndstool.cpp, tools/ndstool/source/ndstree.cpp,
+ tools/ndstool/source/passme.cpp, tools/ndstool/source/passme_sram.c,
+ tools/ndstool/source/raster.cpp, tools/ndstool/source/sha1.cpp,
+ touchscreen/README.reco, touchscreen/parser.c, touchscreen/reco.c,
+ touchscreen/reco.h, touchscreen/touchscreen.c,
+ touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c:
+ New files.
+
Revision 1.7 2007/01/19 14:46:00 wntrmute
name anonymous structs and unions for -std=c99
-
+
Revision 1.6 2005/10/11 05:05:26 dovoto
Added imageTileData(sImage* img) to allow loading of pcx as sprite data.
Updated pcx.c to set image bit per pixel field
-
+
Revision 1.5 2005/08/30 17:54:45 wntrmute
only include required headers
-
+
Revision 1.4 2005/08/22 08:10:35 wntrmute
reformatted for consistency
@@ -123,13 +261,13 @@ void image8to16trans(sImage* img, u8 transparentColor) {
void imageTileData(sImage* img) {
//---------------------------------------------------------------------------------
u32* temp;
-
+
int ix, iy, tx, ty;
int th, tw;
int i = 0;
-
+
//can only tile 8 bit data that is a multiple of 8 in dimention
if(img->bpp != 8 || (img->height & 3) != 0 || (img->width & 3) != 0) return;
@@ -137,16 +275,16 @@ void imageTileData(sImage* img) {
tw = img->width >> 3;
//buffer to hold data
- temp = (u32*)malloc(img->height * img->width);
+ temp = (u32*)malloc(img->height * img->width);
for(ty = 0; ty < th; ty++)
for(tx = 0; tx < tw; tx++)
for(iy = 0; iy < 8; iy++)
for(ix = 0; ix < 2; ix++)
- temp[i++] = img->image.data32[ix + tx * 2 + (iy + ty * 8) * tw * 2 ];
+ temp[i++] = img->image.data32[ix + tx * 2 + (iy + ty * 8) * tw * 2 ];
free(img->image.data32);
-
+
img->image.data32 = temp;
}
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/keys.c b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/keys.c
index 395b1cf237..7f8fb665b0 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/keys.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/keys.c
@@ -25,9 +25,147 @@
distribution.
$Log$
+ Revision 1.1 2008/04/16 18:37:32 joel
+ 2008-04-16 Matthieu Bucchianeri <mbucchia@gmail.com>
+
+ * ChangeLog, Makefile.am, README, bsp_specs, configure.ac,
+ mk_libnds.sh, patch.libnds, preinstall.am, block/block.c,
+ clock/clock.c, console/console.c, coproc/coproc.S, coproc/coproc.c,
+ coproc/coproc.ld, dswifi/dswifi_license.txt, dswifi/makefile,
+ dswifi/arm7/makefile, dswifi/arm7/source/wifi_arm7.c,
+ dswifi/arm7/source/wifi_arm7.h, dswifi/arm9/makefile,
+ dswifi/arm9/source/sgIP.c, dswifi/arm9/source/sgIP.h,
+ dswifi/arm9/source/sgIP_ARP.c, dswifi/arm9/source/sgIP_ARP.h,
+ dswifi/arm9/source/sgIP_Config.h, dswifi/arm9/source/sgIP_DHCP.c,
+ dswifi/arm9/source/sgIP_DHCP.h, dswifi/arm9/source/sgIP_DNS.c,
+ dswifi/arm9/source/sgIP_DNS.h, dswifi/arm9/source/sgIP_Hub.c,
+ dswifi/arm9/source/sgIP_Hub.h, dswifi/arm9/source/sgIP_ICMP.c,
+ dswifi/arm9/source/sgIP_ICMP.h, dswifi/arm9/source/sgIP_IP.c,
+ dswifi/arm9/source/sgIP_IP.h, dswifi/arm9/source/sgIP_TCP.c,
+ dswifi/arm9/source/sgIP_TCP.h, dswifi/arm9/source/sgIP_UDP.c,
+ dswifi/arm9/source/sgIP_UDP.h, dswifi/arm9/source/sgIP_memblock.c,
+ dswifi/arm9/source/sgIP_memblock.h,
+ dswifi/arm9/source/sgIP_sockets.c, dswifi/arm9/source/sgIP_sockets.h,
+ dswifi/arm9/source/wifi_arm9.c, dswifi/arm9/source/wifi_arm9.h,
+ dswifi/common/source/dsregs.h, dswifi/common/source/spinlock.h,
+ dswifi/common/source/spinlock.s, dswifi/common/source/wifi_shared.h,
+ dswifi/include/dswifi7.h, dswifi/include/dswifi9.h,
+ dswifi/include/dswifi_version.h, dswifi/include/netdb.h,
+ dswifi/include/sgIP_errno.h, dswifi/include/netinet/in.h, fb/fb.c,
+ fb/fb.h, include/bsp.h, include/my_ipc.h, include/tm27.h,
+ include/types.h, include/sys/iosupport.h, irq/irq.c, irq/irq.h,
+ libfat/gba/include/fat.h, libfat/include/fat.h,
+ libfat/nds/include/fat.h, libfat/source/bit_ops.h,
+ libfat/source/cache.c, libfat/source/cache.h, libfat/source/common.h,
+ libfat/source/directory.c, libfat/source/directory.h,
+ libfat/source/fatdir.c, libfat/source/fatdir.h,
+ libfat/source/fatfile.c, libfat/source/fatfile.h,
+ libfat/source/file_allocation_table.c,
+ libfat/source/file_allocation_table.h, libfat/source/filetime.c,
+ libfat/source/filetime.h, libfat/source/libfat.c,
+ libfat/source/mem_allocate.h, libfat/source/partition.c,
+ libfat/source/partition.h, libfat/source/disc_io/disc.c,
+ libfat/source/disc_io/disc.h, libfat/source/disc_io/disc_io.h,
+ libfat/source/disc_io/io_cf_common.c,
+ libfat/source/disc_io/io_cf_common.h,
+ libfat/source/disc_io/io_dldi.h, libfat/source/disc_io/io_dldi.s,
+ libfat/source/disc_io/io_efa2.c, libfat/source/disc_io/io_efa2.h,
+ libfat/source/disc_io/io_fcsr.c, libfat/source/disc_io/io_fcsr.h,
+ libfat/source/disc_io/io_m3_common.c,
+ libfat/source/disc_io/io_m3_common.h,
+ libfat/source/disc_io/io_m3cf.c, libfat/source/disc_io/io_m3cf.h,
+ libfat/source/disc_io/io_m3sd.c, libfat/source/disc_io/io_m3sd.h,
+ libfat/source/disc_io/io_mpcf.c, libfat/source/disc_io/io_mpcf.h,
+ libfat/source/disc_io/io_njsd.c, libfat/source/disc_io/io_njsd.h,
+ libfat/source/disc_io/io_nmmc.c, libfat/source/disc_io/io_nmmc.h,
+ libfat/source/disc_io/io_sc_common.c,
+ libfat/source/disc_io/io_sc_common.h,
+ libfat/source/disc_io/io_sccf.c, libfat/source/disc_io/io_sccf.h,
+ libfat/source/disc_io/io_scsd.c, libfat/source/disc_io/io_scsd.h,
+ libfat/source/disc_io/io_scsd_s.s,
+ libfat/source/disc_io/io_sd_common.c,
+ libfat/source/disc_io/io_sd_common.h, libnds/Makefile.arm7,
+ libnds/Makefile.arm9, libnds/libnds_license.txt,
+ libnds/basicARM7/source/defaultARM7.c,
+ libnds/include/default_font_bin.h, libnds/include/gbfs.h,
+ libnds/include/nds.h, libnds/include/nds/bios.h,
+ libnds/include/nds/card.h, libnds/include/nds/dma.h,
+ libnds/include/nds/interrupts.h, libnds/include/nds/ipc.h,
+ libnds/include/nds/jtypes.h, libnds/include/nds/memory.h,
+ libnds/include/nds/registers_alt.h, libnds/include/nds/reload.h,
+ libnds/include/nds/system.h, libnds/include/nds/timers.h,
+ libnds/include/nds/arm7/audio.h, libnds/include/nds/arm7/clock.h,
+ libnds/include/nds/arm7/serial.h, libnds/include/nds/arm7/touch.h,
+ libnds/include/nds/arm9/background.h,
+ libnds/include/nds/arm9/boxtest.h, libnds/include/nds/arm9/cache.h,
+ libnds/include/nds/arm9/console.h,
+ libnds/include/nds/arm9/exceptions.h,
+ libnds/include/nds/arm9/image.h, libnds/include/nds/arm9/input.h,
+ libnds/include/nds/arm9/math.h, libnds/include/nds/arm9/ndsmotion.h,
+ libnds/include/nds/arm9/pcx.h, libnds/include/nds/arm9/postest.h,
+ libnds/include/nds/arm9/rumble.h, libnds/include/nds/arm9/sound.h,
+ libnds/include/nds/arm9/sprite.h, libnds/include/nds/arm9/trig_lut.h,
+ libnds/include/nds/arm9/video.h, libnds/include/nds/arm9/videoGL.h,
+ libnds/source/arm7/audio.c, libnds/source/arm7/clock.c,
+ libnds/source/arm7/microphone.c, libnds/source/arm7/spi.c,
+ libnds/source/arm7/touch.c, libnds/source/arm7/userSettings.c,
+ libnds/source/arm9/COS.bin, libnds/source/arm9/COS.s,
+ libnds/source/arm9/SIN.bin, libnds/source/arm9/SIN.s,
+ libnds/source/arm9/TAN.bin, libnds/source/arm9/TAN.s,
+ libnds/source/arm9/boxtest.c, libnds/source/arm9/console.c,
+ libnds/source/arm9/dcache.s, libnds/source/arm9/default_font.bin,
+ libnds/source/arm9/default_font.s,
+ libnds/source/arm9/exceptionHandler.S,
+ libnds/source/arm9/exceptionHandler.s,
+ libnds/source/arm9/exceptions.c, libnds/source/arm9/gurumeditation.c,
+ libnds/source/arm9/icache.s, libnds/source/arm9/image.c,
+ libnds/source/arm9/initSystem.c, libnds/source/arm9/keys.c,
+ libnds/source/arm9/ndsmotion.c, libnds/source/arm9/pcx.c,
+ libnds/source/arm9/rumble.c, libnds/source/arm9/sound.c,
+ libnds/source/arm9/system.c, libnds/source/arm9/touch.c,
+ libnds/source/arm9/video.c, libnds/source/arm9/videoGL.c,
+ libnds/source/common/biosCalls.s, libnds/source/common/card.c,
+ libnds/source/common/gbfs.c,
+ libnds/source/common/interruptDispatcher.s,
+ libnds/source/common/interrupts.c, rtc/rtc.c, sound/sound.c,
+ sound/sound.h, start/start.S, startup/linkcmds, startup/start.c,
+ timer/timer.c, tools/Makefile.am, tools/bin2s, tools/bin2s.c,
+ tools/configure.ac, tools/runtest,
+ tools/ndstool/include/arm7_sha1_homebrew.h,
+ tools/ndstool/include/arm7_sha1_nintendo.h,
+ tools/ndstool/include/banner.h, tools/ndstool/include/bigint.h,
+ tools/ndstool/include/crc.h, tools/ndstool/include/default_icon.h,
+ tools/ndstool/include/encryption.h, tools/ndstool/include/header.h,
+ tools/ndstool/include/hook.h, tools/ndstool/include/little.h,
+ tools/ndstool/include/loadme.h, tools/ndstool/include/logo.h,
+ tools/ndstool/include/ndscreate.h,
+ tools/ndstool/include/ndsextract.h, tools/ndstool/include/ndstool.h,
+ tools/ndstool/include/ndstree.h, tools/ndstool/include/overlay.h,
+ tools/ndstool/include/passme.h, tools/ndstool/include/passme_sram.h,
+ tools/ndstool/include/passme_vhd1.h,
+ tools/ndstool/include/passme_vhd2.h, tools/ndstool/include/raster.h,
+ tools/ndstool/include/sha1.h, tools/ndstool/include/types.h,
+ tools/ndstool/source/arm7_sha1_homebrew.c,
+ tools/ndstool/source/arm7_sha1_nintendo.c,
+ tools/ndstool/source/banner.cpp, tools/ndstool/source/bigint.cpp,
+ tools/ndstool/source/compile_date.c, tools/ndstool/source/crc.cpp,
+ tools/ndstool/source/default_icon.c,
+ tools/ndstool/source/encryption.cpp, tools/ndstool/source/header.cpp,
+ tools/ndstool/source/hook.cpp, tools/ndstool/source/loadme.c,
+ tools/ndstool/source/logo.cpp, tools/ndstool/source/ndscodes.cpp,
+ tools/ndstool/source/ndscreate.cpp,
+ tools/ndstool/source/ndsextract.cpp,
+ tools/ndstool/source/ndstool.cpp, tools/ndstool/source/ndstree.cpp,
+ tools/ndstool/source/passme.cpp, tools/ndstool/source/passme_sram.c,
+ tools/ndstool/source/raster.cpp, tools/ndstool/source/sha1.cpp,
+ touchscreen/README.reco, touchscreen/parser.c, touchscreen/reco.c,
+ touchscreen/reco.h, touchscreen/touchscreen.c,
+ touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c:
+ New files.
+
Revision 1.15 2006/07/04 01:45:31 wntrmute
remove unused variables
-
+
Revision 1.14 2006/07/02 17:36:51 wntrmute
remove unnecessary IPC reads
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/ndsmotion.c b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/ndsmotion.c
index bd41e7cf5f..fead023ac7 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/ndsmotion.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/ndsmotion.c
@@ -2,7 +2,7 @@
$Id$
DS Motion Card/DS Motion Pak functionality
-
+
Copyright (C) 2007
Michael Noland (joat)
Jason Rogers (dovoto)
@@ -171,7 +171,7 @@ int motion_init(void) {
sysSetBusOwners(true, true);
// first, check for the DS Motion Pak - type 1
if( motion_pak_is_inserted() == 1 )
- {
+ {
card_type = 1;
return 1;
}// next, check for DS Motion Card - type 2
@@ -180,11 +180,11 @@ int motion_init(void) {
card_type = 2;
return 2;
}
-
+
motion_MK6_sensor_mode(); // send command to switch MK6 to sensor mode
-
+
if( motion_enable(3) == 1 )
- {
+ {
card_type = 3;
return 3;
}// if neither cases are true, then return 0 to indicate no DS Motion Sensor
@@ -237,7 +237,7 @@ signed int motion_read_x(void) {
output = ( (motion_spi(0x00)<<8)|motion_spi(0x00) )>>4; // read 16 bits and store as a 12 bit number
SPI_Off()
return output;
- break;
+ break;
default:
return 0;
break;
@@ -276,7 +276,7 @@ signed int motion_read_y(void) {
output = ( (motion_spi(0x00)<<8)|motion_spi(0x00) )>>4; // read 16 bits and store as a 12 bit number
SPI_Off()
return output;
- break;
+ break;
default:
return 0;
break;
@@ -315,7 +315,7 @@ signed int motion_read_z(void) {
output = ( (motion_spi(0x00)<<8)|motion_spi(0x00) )>>4; // read 16 bits and store as a 12 bit number
SPI_Off()
return output;
- break;
+ break;
default:
return 0;
break;
@@ -354,7 +354,7 @@ signed int motion_read_gyro(void) {
output = ( (motion_spi(0x00)<<8)|motion_spi(0x00) )>>4; // read 16 bits and store as a 12 bit number
SPI_Off()
return output;
- break;
+ break;
default:
return 0;
break;
@@ -483,6 +483,6 @@ int motion_read_ain_2(void){
swiDelay(WAIT_CYCLES); // wait after for Motion Pak to be ready for next command
signed int output = (signed int)( (High_byte<<8 | Low_byte)>>4);
return output;
-}
+}
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/pcx.c b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/pcx.c
index 6e56011051..0b570476d5 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/pcx.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/pcx.c
@@ -23,31 +23,169 @@
distribution.
$Log$
+ Revision 1.1 2008/04/16 18:37:32 joel
+ 2008-04-16 Matthieu Bucchianeri <mbucchia@gmail.com>
+
+ * ChangeLog, Makefile.am, README, bsp_specs, configure.ac,
+ mk_libnds.sh, patch.libnds, preinstall.am, block/block.c,
+ clock/clock.c, console/console.c, coproc/coproc.S, coproc/coproc.c,
+ coproc/coproc.ld, dswifi/dswifi_license.txt, dswifi/makefile,
+ dswifi/arm7/makefile, dswifi/arm7/source/wifi_arm7.c,
+ dswifi/arm7/source/wifi_arm7.h, dswifi/arm9/makefile,
+ dswifi/arm9/source/sgIP.c, dswifi/arm9/source/sgIP.h,
+ dswifi/arm9/source/sgIP_ARP.c, dswifi/arm9/source/sgIP_ARP.h,
+ dswifi/arm9/source/sgIP_Config.h, dswifi/arm9/source/sgIP_DHCP.c,
+ dswifi/arm9/source/sgIP_DHCP.h, dswifi/arm9/source/sgIP_DNS.c,
+ dswifi/arm9/source/sgIP_DNS.h, dswifi/arm9/source/sgIP_Hub.c,
+ dswifi/arm9/source/sgIP_Hub.h, dswifi/arm9/source/sgIP_ICMP.c,
+ dswifi/arm9/source/sgIP_ICMP.h, dswifi/arm9/source/sgIP_IP.c,
+ dswifi/arm9/source/sgIP_IP.h, dswifi/arm9/source/sgIP_TCP.c,
+ dswifi/arm9/source/sgIP_TCP.h, dswifi/arm9/source/sgIP_UDP.c,
+ dswifi/arm9/source/sgIP_UDP.h, dswifi/arm9/source/sgIP_memblock.c,
+ dswifi/arm9/source/sgIP_memblock.h,
+ dswifi/arm9/source/sgIP_sockets.c, dswifi/arm9/source/sgIP_sockets.h,
+ dswifi/arm9/source/wifi_arm9.c, dswifi/arm9/source/wifi_arm9.h,
+ dswifi/common/source/dsregs.h, dswifi/common/source/spinlock.h,
+ dswifi/common/source/spinlock.s, dswifi/common/source/wifi_shared.h,
+ dswifi/include/dswifi7.h, dswifi/include/dswifi9.h,
+ dswifi/include/dswifi_version.h, dswifi/include/netdb.h,
+ dswifi/include/sgIP_errno.h, dswifi/include/netinet/in.h, fb/fb.c,
+ fb/fb.h, include/bsp.h, include/my_ipc.h, include/tm27.h,
+ include/types.h, include/sys/iosupport.h, irq/irq.c, irq/irq.h,
+ libfat/gba/include/fat.h, libfat/include/fat.h,
+ libfat/nds/include/fat.h, libfat/source/bit_ops.h,
+ libfat/source/cache.c, libfat/source/cache.h, libfat/source/common.h,
+ libfat/source/directory.c, libfat/source/directory.h,
+ libfat/source/fatdir.c, libfat/source/fatdir.h,
+ libfat/source/fatfile.c, libfat/source/fatfile.h,
+ libfat/source/file_allocation_table.c,
+ libfat/source/file_allocation_table.h, libfat/source/filetime.c,
+ libfat/source/filetime.h, libfat/source/libfat.c,
+ libfat/source/mem_allocate.h, libfat/source/partition.c,
+ libfat/source/partition.h, libfat/source/disc_io/disc.c,
+ libfat/source/disc_io/disc.h, libfat/source/disc_io/disc_io.h,
+ libfat/source/disc_io/io_cf_common.c,
+ libfat/source/disc_io/io_cf_common.h,
+ libfat/source/disc_io/io_dldi.h, libfat/source/disc_io/io_dldi.s,
+ libfat/source/disc_io/io_efa2.c, libfat/source/disc_io/io_efa2.h,
+ libfat/source/disc_io/io_fcsr.c, libfat/source/disc_io/io_fcsr.h,
+ libfat/source/disc_io/io_m3_common.c,
+ libfat/source/disc_io/io_m3_common.h,
+ libfat/source/disc_io/io_m3cf.c, libfat/source/disc_io/io_m3cf.h,
+ libfat/source/disc_io/io_m3sd.c, libfat/source/disc_io/io_m3sd.h,
+ libfat/source/disc_io/io_mpcf.c, libfat/source/disc_io/io_mpcf.h,
+ libfat/source/disc_io/io_njsd.c, libfat/source/disc_io/io_njsd.h,
+ libfat/source/disc_io/io_nmmc.c, libfat/source/disc_io/io_nmmc.h,
+ libfat/source/disc_io/io_sc_common.c,
+ libfat/source/disc_io/io_sc_common.h,
+ libfat/source/disc_io/io_sccf.c, libfat/source/disc_io/io_sccf.h,
+ libfat/source/disc_io/io_scsd.c, libfat/source/disc_io/io_scsd.h,
+ libfat/source/disc_io/io_scsd_s.s,
+ libfat/source/disc_io/io_sd_common.c,
+ libfat/source/disc_io/io_sd_common.h, libnds/Makefile.arm7,
+ libnds/Makefile.arm9, libnds/libnds_license.txt,
+ libnds/basicARM7/source/defaultARM7.c,
+ libnds/include/default_font_bin.h, libnds/include/gbfs.h,
+ libnds/include/nds.h, libnds/include/nds/bios.h,
+ libnds/include/nds/card.h, libnds/include/nds/dma.h,
+ libnds/include/nds/interrupts.h, libnds/include/nds/ipc.h,
+ libnds/include/nds/jtypes.h, libnds/include/nds/memory.h,
+ libnds/include/nds/registers_alt.h, libnds/include/nds/reload.h,
+ libnds/include/nds/system.h, libnds/include/nds/timers.h,
+ libnds/include/nds/arm7/audio.h, libnds/include/nds/arm7/clock.h,
+ libnds/include/nds/arm7/serial.h, libnds/include/nds/arm7/touch.h,
+ libnds/include/nds/arm9/background.h,
+ libnds/include/nds/arm9/boxtest.h, libnds/include/nds/arm9/cache.h,
+ libnds/include/nds/arm9/console.h,
+ libnds/include/nds/arm9/exceptions.h,
+ libnds/include/nds/arm9/image.h, libnds/include/nds/arm9/input.h,
+ libnds/include/nds/arm9/math.h, libnds/include/nds/arm9/ndsmotion.h,
+ libnds/include/nds/arm9/pcx.h, libnds/include/nds/arm9/postest.h,
+ libnds/include/nds/arm9/rumble.h, libnds/include/nds/arm9/sound.h,
+ libnds/include/nds/arm9/sprite.h, libnds/include/nds/arm9/trig_lut.h,
+ libnds/include/nds/arm9/video.h, libnds/include/nds/arm9/videoGL.h,
+ libnds/source/arm7/audio.c, libnds/source/arm7/clock.c,
+ libnds/source/arm7/microphone.c, libnds/source/arm7/spi.c,
+ libnds/source/arm7/touch.c, libnds/source/arm7/userSettings.c,
+ libnds/source/arm9/COS.bin, libnds/source/arm9/COS.s,
+ libnds/source/arm9/SIN.bin, libnds/source/arm9/SIN.s,
+ libnds/source/arm9/TAN.bin, libnds/source/arm9/TAN.s,
+ libnds/source/arm9/boxtest.c, libnds/source/arm9/console.c,
+ libnds/source/arm9/dcache.s, libnds/source/arm9/default_font.bin,
+ libnds/source/arm9/default_font.s,
+ libnds/source/arm9/exceptionHandler.S,
+ libnds/source/arm9/exceptionHandler.s,
+ libnds/source/arm9/exceptions.c, libnds/source/arm9/gurumeditation.c,
+ libnds/source/arm9/icache.s, libnds/source/arm9/image.c,
+ libnds/source/arm9/initSystem.c, libnds/source/arm9/keys.c,
+ libnds/source/arm9/ndsmotion.c, libnds/source/arm9/pcx.c,
+ libnds/source/arm9/rumble.c, libnds/source/arm9/sound.c,
+ libnds/source/arm9/system.c, libnds/source/arm9/touch.c,
+ libnds/source/arm9/video.c, libnds/source/arm9/videoGL.c,
+ libnds/source/common/biosCalls.s, libnds/source/common/card.c,
+ libnds/source/common/gbfs.c,
+ libnds/source/common/interruptDispatcher.s,
+ libnds/source/common/interrupts.c, rtc/rtc.c, sound/sound.c,
+ sound/sound.h, start/start.S, startup/linkcmds, startup/start.c,
+ timer/timer.c, tools/Makefile.am, tools/bin2s, tools/bin2s.c,
+ tools/configure.ac, tools/runtest,
+ tools/ndstool/include/arm7_sha1_homebrew.h,
+ tools/ndstool/include/arm7_sha1_nintendo.h,
+ tools/ndstool/include/banner.h, tools/ndstool/include/bigint.h,
+ tools/ndstool/include/crc.h, tools/ndstool/include/default_icon.h,
+ tools/ndstool/include/encryption.h, tools/ndstool/include/header.h,
+ tools/ndstool/include/hook.h, tools/ndstool/include/little.h,
+ tools/ndstool/include/loadme.h, tools/ndstool/include/logo.h,
+ tools/ndstool/include/ndscreate.h,
+ tools/ndstool/include/ndsextract.h, tools/ndstool/include/ndstool.h,
+ tools/ndstool/include/ndstree.h, tools/ndstool/include/overlay.h,
+ tools/ndstool/include/passme.h, tools/ndstool/include/passme_sram.h,
+ tools/ndstool/include/passme_vhd1.h,
+ tools/ndstool/include/passme_vhd2.h, tools/ndstool/include/raster.h,
+ tools/ndstool/include/sha1.h, tools/ndstool/include/types.h,
+ tools/ndstool/source/arm7_sha1_homebrew.c,
+ tools/ndstool/source/arm7_sha1_nintendo.c,
+ tools/ndstool/source/banner.cpp, tools/ndstool/source/bigint.cpp,
+ tools/ndstool/source/compile_date.c, tools/ndstool/source/crc.cpp,
+ tools/ndstool/source/default_icon.c,
+ tools/ndstool/source/encryption.cpp, tools/ndstool/source/header.cpp,
+ tools/ndstool/source/hook.cpp, tools/ndstool/source/loadme.c,
+ tools/ndstool/source/logo.cpp, tools/ndstool/source/ndscodes.cpp,
+ tools/ndstool/source/ndscreate.cpp,
+ tools/ndstool/source/ndsextract.cpp,
+ tools/ndstool/source/ndstool.cpp, tools/ndstool/source/ndstree.cpp,
+ tools/ndstool/source/passme.cpp, tools/ndstool/source/passme_sram.c,
+ tools/ndstool/source/raster.cpp, tools/ndstool/source/sha1.cpp,
+ touchscreen/README.reco, touchscreen/parser.c, touchscreen/reco.c,
+ touchscreen/reco.h, touchscreen/touchscreen.c,
+ touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c:
+ New files.
+
Revision 1.9 2007/01/19 14:46:00 wntrmute
name anonymous structs and unions for -std=c99
-
+
Revision 1.8 2005/11/07 04:12:34 dovoto
Fixed palette rounding issue
-
+
Revision 1.7 2005/10/11 05:05:26 dovoto
Added imageTileData(sImage* img) to allow loading of pcx as sprite data.
Updated pcx.c to set image bit per pixel field
-
+
Revision 1.6 2005/08/23 17:06:10 wntrmute
converted all endings to unix
-
+
Revision 1.5 2005/08/03 18:08:13 wntrmute
*** empty log message ***
-
+
Revision 1.4 2005/08/03 05:18:06 wntrmute
tidied formatting
-
+
Revision 1.3 2005/08/03 05:05:59 dovoto
added rounding to palette conversion
-
+
Revision 1.2 2005/08/01 23:18:22 wntrmute
adjusted headers for logging
-
+
Revision 1.1 2005/07/27 02:20:52 wntrmute
add image functions
@@ -62,11 +200,11 @@ int loadPCX(unsigned char* pcx, sImage* image) {
//---------------------------------------------------------------------------------
//struct rgb {unsigned char b,g,r;};
RGB_24* pal;
-
+
PCXHeader* hdr = (PCXHeader*) pcx;
pcx += sizeof(PCXHeader);
-
+
unsigned char c;
int size;
int count;
@@ -77,30 +215,30 @@ int loadPCX(unsigned char* pcx, sImage* image) {
image->height = hdr->ymax - hdr->ymin + 1;
size = image->width *image->height;
-
+
image->image.data8 = (unsigned char*)malloc(size);
image->palette = (unsigned short*)malloc(256 * 2);
if(hdr->bitsPerPixel != 8)
return 0;
-
+
count = 0;
while(count < size) {
c = *pcx++;
-
+
if(c < 192) {
image->image.data8[count++] = c;
} else {
run = c - 192;
-
+
c = *pcx++;
-
+
for(i = 0; i < run; i++)
image->image.data8[count++] = c;
}
}
-
+
pal = (RGB_24*)(pcx + 1);
image->bpp = 8;
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/rumble.c b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/rumble.c
index 6b5a8959c8..e027dcc5e2 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/rumble.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/rumble.c
@@ -11,7 +11,7 @@
Permission is granted to anyone to use this software for any
purpose, including commercial applications, and to alter it and
redistribute it freely, subject to the following restrictions:
-
+
1. The origin of this software must not be misrepresented; you
must not claim that you wrote the original software. If you use
this software in a product, an acknowledgment in the product
@@ -22,20 +22,158 @@
distribution.
$Log$
+ Revision 1.1 2008/04/16 18:37:32 joel
+ 2008-04-16 Matthieu Bucchianeri <mbucchia@gmail.com>
+
+ * ChangeLog, Makefile.am, README, bsp_specs, configure.ac,
+ mk_libnds.sh, patch.libnds, preinstall.am, block/block.c,
+ clock/clock.c, console/console.c, coproc/coproc.S, coproc/coproc.c,
+ coproc/coproc.ld, dswifi/dswifi_license.txt, dswifi/makefile,
+ dswifi/arm7/makefile, dswifi/arm7/source/wifi_arm7.c,
+ dswifi/arm7/source/wifi_arm7.h, dswifi/arm9/makefile,
+ dswifi/arm9/source/sgIP.c, dswifi/arm9/source/sgIP.h,
+ dswifi/arm9/source/sgIP_ARP.c, dswifi/arm9/source/sgIP_ARP.h,
+ dswifi/arm9/source/sgIP_Config.h, dswifi/arm9/source/sgIP_DHCP.c,
+ dswifi/arm9/source/sgIP_DHCP.h, dswifi/arm9/source/sgIP_DNS.c,
+ dswifi/arm9/source/sgIP_DNS.h, dswifi/arm9/source/sgIP_Hub.c,
+ dswifi/arm9/source/sgIP_Hub.h, dswifi/arm9/source/sgIP_ICMP.c,
+ dswifi/arm9/source/sgIP_ICMP.h, dswifi/arm9/source/sgIP_IP.c,
+ dswifi/arm9/source/sgIP_IP.h, dswifi/arm9/source/sgIP_TCP.c,
+ dswifi/arm9/source/sgIP_TCP.h, dswifi/arm9/source/sgIP_UDP.c,
+ dswifi/arm9/source/sgIP_UDP.h, dswifi/arm9/source/sgIP_memblock.c,
+ dswifi/arm9/source/sgIP_memblock.h,
+ dswifi/arm9/source/sgIP_sockets.c, dswifi/arm9/source/sgIP_sockets.h,
+ dswifi/arm9/source/wifi_arm9.c, dswifi/arm9/source/wifi_arm9.h,
+ dswifi/common/source/dsregs.h, dswifi/common/source/spinlock.h,
+ dswifi/common/source/spinlock.s, dswifi/common/source/wifi_shared.h,
+ dswifi/include/dswifi7.h, dswifi/include/dswifi9.h,
+ dswifi/include/dswifi_version.h, dswifi/include/netdb.h,
+ dswifi/include/sgIP_errno.h, dswifi/include/netinet/in.h, fb/fb.c,
+ fb/fb.h, include/bsp.h, include/my_ipc.h, include/tm27.h,
+ include/types.h, include/sys/iosupport.h, irq/irq.c, irq/irq.h,
+ libfat/gba/include/fat.h, libfat/include/fat.h,
+ libfat/nds/include/fat.h, libfat/source/bit_ops.h,
+ libfat/source/cache.c, libfat/source/cache.h, libfat/source/common.h,
+ libfat/source/directory.c, libfat/source/directory.h,
+ libfat/source/fatdir.c, libfat/source/fatdir.h,
+ libfat/source/fatfile.c, libfat/source/fatfile.h,
+ libfat/source/file_allocation_table.c,
+ libfat/source/file_allocation_table.h, libfat/source/filetime.c,
+ libfat/source/filetime.h, libfat/source/libfat.c,
+ libfat/source/mem_allocate.h, libfat/source/partition.c,
+ libfat/source/partition.h, libfat/source/disc_io/disc.c,
+ libfat/source/disc_io/disc.h, libfat/source/disc_io/disc_io.h,
+ libfat/source/disc_io/io_cf_common.c,
+ libfat/source/disc_io/io_cf_common.h,
+ libfat/source/disc_io/io_dldi.h, libfat/source/disc_io/io_dldi.s,
+ libfat/source/disc_io/io_efa2.c, libfat/source/disc_io/io_efa2.h,
+ libfat/source/disc_io/io_fcsr.c, libfat/source/disc_io/io_fcsr.h,
+ libfat/source/disc_io/io_m3_common.c,
+ libfat/source/disc_io/io_m3_common.h,
+ libfat/source/disc_io/io_m3cf.c, libfat/source/disc_io/io_m3cf.h,
+ libfat/source/disc_io/io_m3sd.c, libfat/source/disc_io/io_m3sd.h,
+ libfat/source/disc_io/io_mpcf.c, libfat/source/disc_io/io_mpcf.h,
+ libfat/source/disc_io/io_njsd.c, libfat/source/disc_io/io_njsd.h,
+ libfat/source/disc_io/io_nmmc.c, libfat/source/disc_io/io_nmmc.h,
+ libfat/source/disc_io/io_sc_common.c,
+ libfat/source/disc_io/io_sc_common.h,
+ libfat/source/disc_io/io_sccf.c, libfat/source/disc_io/io_sccf.h,
+ libfat/source/disc_io/io_scsd.c, libfat/source/disc_io/io_scsd.h,
+ libfat/source/disc_io/io_scsd_s.s,
+ libfat/source/disc_io/io_sd_common.c,
+ libfat/source/disc_io/io_sd_common.h, libnds/Makefile.arm7,
+ libnds/Makefile.arm9, libnds/libnds_license.txt,
+ libnds/basicARM7/source/defaultARM7.c,
+ libnds/include/default_font_bin.h, libnds/include/gbfs.h,
+ libnds/include/nds.h, libnds/include/nds/bios.h,
+ libnds/include/nds/card.h, libnds/include/nds/dma.h,
+ libnds/include/nds/interrupts.h, libnds/include/nds/ipc.h,
+ libnds/include/nds/jtypes.h, libnds/include/nds/memory.h,
+ libnds/include/nds/registers_alt.h, libnds/include/nds/reload.h,
+ libnds/include/nds/system.h, libnds/include/nds/timers.h,
+ libnds/include/nds/arm7/audio.h, libnds/include/nds/arm7/clock.h,
+ libnds/include/nds/arm7/serial.h, libnds/include/nds/arm7/touch.h,
+ libnds/include/nds/arm9/background.h,
+ libnds/include/nds/arm9/boxtest.h, libnds/include/nds/arm9/cache.h,
+ libnds/include/nds/arm9/console.h,
+ libnds/include/nds/arm9/exceptions.h,
+ libnds/include/nds/arm9/image.h, libnds/include/nds/arm9/input.h,
+ libnds/include/nds/arm9/math.h, libnds/include/nds/arm9/ndsmotion.h,
+ libnds/include/nds/arm9/pcx.h, libnds/include/nds/arm9/postest.h,
+ libnds/include/nds/arm9/rumble.h, libnds/include/nds/arm9/sound.h,
+ libnds/include/nds/arm9/sprite.h, libnds/include/nds/arm9/trig_lut.h,
+ libnds/include/nds/arm9/video.h, libnds/include/nds/arm9/videoGL.h,
+ libnds/source/arm7/audio.c, libnds/source/arm7/clock.c,
+ libnds/source/arm7/microphone.c, libnds/source/arm7/spi.c,
+ libnds/source/arm7/touch.c, libnds/source/arm7/userSettings.c,
+ libnds/source/arm9/COS.bin, libnds/source/arm9/COS.s,
+ libnds/source/arm9/SIN.bin, libnds/source/arm9/SIN.s,
+ libnds/source/arm9/TAN.bin, libnds/source/arm9/TAN.s,
+ libnds/source/arm9/boxtest.c, libnds/source/arm9/console.c,
+ libnds/source/arm9/dcache.s, libnds/source/arm9/default_font.bin,
+ libnds/source/arm9/default_font.s,
+ libnds/source/arm9/exceptionHandler.S,
+ libnds/source/arm9/exceptionHandler.s,
+ libnds/source/arm9/exceptions.c, libnds/source/arm9/gurumeditation.c,
+ libnds/source/arm9/icache.s, libnds/source/arm9/image.c,
+ libnds/source/arm9/initSystem.c, libnds/source/arm9/keys.c,
+ libnds/source/arm9/ndsmotion.c, libnds/source/arm9/pcx.c,
+ libnds/source/arm9/rumble.c, libnds/source/arm9/sound.c,
+ libnds/source/arm9/system.c, libnds/source/arm9/touch.c,
+ libnds/source/arm9/video.c, libnds/source/arm9/videoGL.c,
+ libnds/source/common/biosCalls.s, libnds/source/common/card.c,
+ libnds/source/common/gbfs.c,
+ libnds/source/common/interruptDispatcher.s,
+ libnds/source/common/interrupts.c, rtc/rtc.c, sound/sound.c,
+ sound/sound.h, start/start.S, startup/linkcmds, startup/start.c,
+ timer/timer.c, tools/Makefile.am, tools/bin2s, tools/bin2s.c,
+ tools/configure.ac, tools/runtest,
+ tools/ndstool/include/arm7_sha1_homebrew.h,
+ tools/ndstool/include/arm7_sha1_nintendo.h,
+ tools/ndstool/include/banner.h, tools/ndstool/include/bigint.h,
+ tools/ndstool/include/crc.h, tools/ndstool/include/default_icon.h,
+ tools/ndstool/include/encryption.h, tools/ndstool/include/header.h,
+ tools/ndstool/include/hook.h, tools/ndstool/include/little.h,
+ tools/ndstool/include/loadme.h, tools/ndstool/include/logo.h,
+ tools/ndstool/include/ndscreate.h,
+ tools/ndstool/include/ndsextract.h, tools/ndstool/include/ndstool.h,
+ tools/ndstool/include/ndstree.h, tools/ndstool/include/overlay.h,
+ tools/ndstool/include/passme.h, tools/ndstool/include/passme_sram.h,
+ tools/ndstool/include/passme_vhd1.h,
+ tools/ndstool/include/passme_vhd2.h, tools/ndstool/include/raster.h,
+ tools/ndstool/include/sha1.h, tools/ndstool/include/types.h,
+ tools/ndstool/source/arm7_sha1_homebrew.c,
+ tools/ndstool/source/arm7_sha1_nintendo.c,
+ tools/ndstool/source/banner.cpp, tools/ndstool/source/bigint.cpp,
+ tools/ndstool/source/compile_date.c, tools/ndstool/source/crc.cpp,
+ tools/ndstool/source/default_icon.c,
+ tools/ndstool/source/encryption.cpp, tools/ndstool/source/header.cpp,
+ tools/ndstool/source/hook.cpp, tools/ndstool/source/loadme.c,
+ tools/ndstool/source/logo.cpp, tools/ndstool/source/ndscodes.cpp,
+ tools/ndstool/source/ndscreate.cpp,
+ tools/ndstool/source/ndsextract.cpp,
+ tools/ndstool/source/ndstool.cpp, tools/ndstool/source/ndstree.cpp,
+ tools/ndstool/source/passme.cpp, tools/ndstool/source/passme_sram.c,
+ tools/ndstool/source/raster.cpp, tools/ndstool/source/sha1.cpp,
+ touchscreen/README.reco, touchscreen/parser.c, touchscreen/reco.c,
+ touchscreen/reco.h, touchscreen/touchscreen.c,
+ touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c:
+ New files.
+
Revision 1.5 2007/02/07 16:38:11 wntrmute
add warioware rumble support
-
+
Revision 1.4 2006/04/26 05:54:00 wntrmute
removed include of nds.h
reformatted for consistency
-
+
Revision 1.3 2005/11/27 07:47:07 joatski
Fixed multiple linebreaks.
Moved cart bus control functions and GBA header to memory.h
-
+
Revision 1.2 2005/11/02 07:06:20 bigredpimp
Added revision comment block
-
+
---------------------------------------------------------------------------------*/
#include <nds/jtypes.h>
#include <nds/memory.h>
@@ -64,7 +202,7 @@ bool isRumbleInserted(void) {
return true;
}
return false;
-
+
} else {
rumbleType = RUMBLE;
@@ -81,7 +219,7 @@ void setRumble(bool position) {
//---------------------------------------------------------------------------------
if( rumbleType == WARIOWARE) {
- WARIOWARE_PAK = (position ? 8 : 0);
+ WARIOWARE_PAK = (position ? 8 : 0);
} else {
RUMBLE_PAK = (position ? 2 : 0);
}
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/sound.c b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/sound.c
index e2c0570c44..134535ec2e 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/sound.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/sound.c
@@ -24,9 +24,147 @@
distribution.
$Log$
+ Revision 1.1 2008/04/16 18:37:32 joel
+ 2008-04-16 Matthieu Bucchianeri <mbucchia@gmail.com>
+
+ * ChangeLog, Makefile.am, README, bsp_specs, configure.ac,
+ mk_libnds.sh, patch.libnds, preinstall.am, block/block.c,
+ clock/clock.c, console/console.c, coproc/coproc.S, coproc/coproc.c,
+ coproc/coproc.ld, dswifi/dswifi_license.txt, dswifi/makefile,
+ dswifi/arm7/makefile, dswifi/arm7/source/wifi_arm7.c,
+ dswifi/arm7/source/wifi_arm7.h, dswifi/arm9/makefile,
+ dswifi/arm9/source/sgIP.c, dswifi/arm9/source/sgIP.h,
+ dswifi/arm9/source/sgIP_ARP.c, dswifi/arm9/source/sgIP_ARP.h,
+ dswifi/arm9/source/sgIP_Config.h, dswifi/arm9/source/sgIP_DHCP.c,
+ dswifi/arm9/source/sgIP_DHCP.h, dswifi/arm9/source/sgIP_DNS.c,
+ dswifi/arm9/source/sgIP_DNS.h, dswifi/arm9/source/sgIP_Hub.c,
+ dswifi/arm9/source/sgIP_Hub.h, dswifi/arm9/source/sgIP_ICMP.c,
+ dswifi/arm9/source/sgIP_ICMP.h, dswifi/arm9/source/sgIP_IP.c,
+ dswifi/arm9/source/sgIP_IP.h, dswifi/arm9/source/sgIP_TCP.c,
+ dswifi/arm9/source/sgIP_TCP.h, dswifi/arm9/source/sgIP_UDP.c,
+ dswifi/arm9/source/sgIP_UDP.h, dswifi/arm9/source/sgIP_memblock.c,
+ dswifi/arm9/source/sgIP_memblock.h,
+ dswifi/arm9/source/sgIP_sockets.c, dswifi/arm9/source/sgIP_sockets.h,
+ dswifi/arm9/source/wifi_arm9.c, dswifi/arm9/source/wifi_arm9.h,
+ dswifi/common/source/dsregs.h, dswifi/common/source/spinlock.h,
+ dswifi/common/source/spinlock.s, dswifi/common/source/wifi_shared.h,
+ dswifi/include/dswifi7.h, dswifi/include/dswifi9.h,
+ dswifi/include/dswifi_version.h, dswifi/include/netdb.h,
+ dswifi/include/sgIP_errno.h, dswifi/include/netinet/in.h, fb/fb.c,
+ fb/fb.h, include/bsp.h, include/my_ipc.h, include/tm27.h,
+ include/types.h, include/sys/iosupport.h, irq/irq.c, irq/irq.h,
+ libfat/gba/include/fat.h, libfat/include/fat.h,
+ libfat/nds/include/fat.h, libfat/source/bit_ops.h,
+ libfat/source/cache.c, libfat/source/cache.h, libfat/source/common.h,
+ libfat/source/directory.c, libfat/source/directory.h,
+ libfat/source/fatdir.c, libfat/source/fatdir.h,
+ libfat/source/fatfile.c, libfat/source/fatfile.h,
+ libfat/source/file_allocation_table.c,
+ libfat/source/file_allocation_table.h, libfat/source/filetime.c,
+ libfat/source/filetime.h, libfat/source/libfat.c,
+ libfat/source/mem_allocate.h, libfat/source/partition.c,
+ libfat/source/partition.h, libfat/source/disc_io/disc.c,
+ libfat/source/disc_io/disc.h, libfat/source/disc_io/disc_io.h,
+ libfat/source/disc_io/io_cf_common.c,
+ libfat/source/disc_io/io_cf_common.h,
+ libfat/source/disc_io/io_dldi.h, libfat/source/disc_io/io_dldi.s,
+ libfat/source/disc_io/io_efa2.c, libfat/source/disc_io/io_efa2.h,
+ libfat/source/disc_io/io_fcsr.c, libfat/source/disc_io/io_fcsr.h,
+ libfat/source/disc_io/io_m3_common.c,
+ libfat/source/disc_io/io_m3_common.h,
+ libfat/source/disc_io/io_m3cf.c, libfat/source/disc_io/io_m3cf.h,
+ libfat/source/disc_io/io_m3sd.c, libfat/source/disc_io/io_m3sd.h,
+ libfat/source/disc_io/io_mpcf.c, libfat/source/disc_io/io_mpcf.h,
+ libfat/source/disc_io/io_njsd.c, libfat/source/disc_io/io_njsd.h,
+ libfat/source/disc_io/io_nmmc.c, libfat/source/disc_io/io_nmmc.h,
+ libfat/source/disc_io/io_sc_common.c,
+ libfat/source/disc_io/io_sc_common.h,
+ libfat/source/disc_io/io_sccf.c, libfat/source/disc_io/io_sccf.h,
+ libfat/source/disc_io/io_scsd.c, libfat/source/disc_io/io_scsd.h,
+ libfat/source/disc_io/io_scsd_s.s,
+ libfat/source/disc_io/io_sd_common.c,
+ libfat/source/disc_io/io_sd_common.h, libnds/Makefile.arm7,
+ libnds/Makefile.arm9, libnds/libnds_license.txt,
+ libnds/basicARM7/source/defaultARM7.c,
+ libnds/include/default_font_bin.h, libnds/include/gbfs.h,
+ libnds/include/nds.h, libnds/include/nds/bios.h,
+ libnds/include/nds/card.h, libnds/include/nds/dma.h,
+ libnds/include/nds/interrupts.h, libnds/include/nds/ipc.h,
+ libnds/include/nds/jtypes.h, libnds/include/nds/memory.h,
+ libnds/include/nds/registers_alt.h, libnds/include/nds/reload.h,
+ libnds/include/nds/system.h, libnds/include/nds/timers.h,
+ libnds/include/nds/arm7/audio.h, libnds/include/nds/arm7/clock.h,
+ libnds/include/nds/arm7/serial.h, libnds/include/nds/arm7/touch.h,
+ libnds/include/nds/arm9/background.h,
+ libnds/include/nds/arm9/boxtest.h, libnds/include/nds/arm9/cache.h,
+ libnds/include/nds/arm9/console.h,
+ libnds/include/nds/arm9/exceptions.h,
+ libnds/include/nds/arm9/image.h, libnds/include/nds/arm9/input.h,
+ libnds/include/nds/arm9/math.h, libnds/include/nds/arm9/ndsmotion.h,
+ libnds/include/nds/arm9/pcx.h, libnds/include/nds/arm9/postest.h,
+ libnds/include/nds/arm9/rumble.h, libnds/include/nds/arm9/sound.h,
+ libnds/include/nds/arm9/sprite.h, libnds/include/nds/arm9/trig_lut.h,
+ libnds/include/nds/arm9/video.h, libnds/include/nds/arm9/videoGL.h,
+ libnds/source/arm7/audio.c, libnds/source/arm7/clock.c,
+ libnds/source/arm7/microphone.c, libnds/source/arm7/spi.c,
+ libnds/source/arm7/touch.c, libnds/source/arm7/userSettings.c,
+ libnds/source/arm9/COS.bin, libnds/source/arm9/COS.s,
+ libnds/source/arm9/SIN.bin, libnds/source/arm9/SIN.s,
+ libnds/source/arm9/TAN.bin, libnds/source/arm9/TAN.s,
+ libnds/source/arm9/boxtest.c, libnds/source/arm9/console.c,
+ libnds/source/arm9/dcache.s, libnds/source/arm9/default_font.bin,
+ libnds/source/arm9/default_font.s,
+ libnds/source/arm9/exceptionHandler.S,
+ libnds/source/arm9/exceptionHandler.s,
+ libnds/source/arm9/exceptions.c, libnds/source/arm9/gurumeditation.c,
+ libnds/source/arm9/icache.s, libnds/source/arm9/image.c,
+ libnds/source/arm9/initSystem.c, libnds/source/arm9/keys.c,
+ libnds/source/arm9/ndsmotion.c, libnds/source/arm9/pcx.c,
+ libnds/source/arm9/rumble.c, libnds/source/arm9/sound.c,
+ libnds/source/arm9/system.c, libnds/source/arm9/touch.c,
+ libnds/source/arm9/video.c, libnds/source/arm9/videoGL.c,
+ libnds/source/common/biosCalls.s, libnds/source/common/card.c,
+ libnds/source/common/gbfs.c,
+ libnds/source/common/interruptDispatcher.s,
+ libnds/source/common/interrupts.c, rtc/rtc.c, sound/sound.c,
+ sound/sound.h, start/start.S, startup/linkcmds, startup/start.c,
+ timer/timer.c, tools/Makefile.am, tools/bin2s, tools/bin2s.c,
+ tools/configure.ac, tools/runtest,
+ tools/ndstool/include/arm7_sha1_homebrew.h,
+ tools/ndstool/include/arm7_sha1_nintendo.h,
+ tools/ndstool/include/banner.h, tools/ndstool/include/bigint.h,
+ tools/ndstool/include/crc.h, tools/ndstool/include/default_icon.h,
+ tools/ndstool/include/encryption.h, tools/ndstool/include/header.h,
+ tools/ndstool/include/hook.h, tools/ndstool/include/little.h,
+ tools/ndstool/include/loadme.h, tools/ndstool/include/logo.h,
+ tools/ndstool/include/ndscreate.h,
+ tools/ndstool/include/ndsextract.h, tools/ndstool/include/ndstool.h,
+ tools/ndstool/include/ndstree.h, tools/ndstool/include/overlay.h,
+ tools/ndstool/include/passme.h, tools/ndstool/include/passme_sram.h,
+ tools/ndstool/include/passme_vhd1.h,
+ tools/ndstool/include/passme_vhd2.h, tools/ndstool/include/raster.h,
+ tools/ndstool/include/sha1.h, tools/ndstool/include/types.h,
+ tools/ndstool/source/arm7_sha1_homebrew.c,
+ tools/ndstool/source/arm7_sha1_nintendo.c,
+ tools/ndstool/source/banner.cpp, tools/ndstool/source/bigint.cpp,
+ tools/ndstool/source/compile_date.c, tools/ndstool/source/crc.cpp,
+ tools/ndstool/source/default_icon.c,
+ tools/ndstool/source/encryption.cpp, tools/ndstool/source/header.cpp,
+ tools/ndstool/source/hook.cpp, tools/ndstool/source/loadme.c,
+ tools/ndstool/source/logo.cpp, tools/ndstool/source/ndscodes.cpp,
+ tools/ndstool/source/ndscreate.cpp,
+ tools/ndstool/source/ndsextract.cpp,
+ tools/ndstool/source/ndstool.cpp, tools/ndstool/source/ndstree.cpp,
+ tools/ndstool/source/passme.cpp, tools/ndstool/source/passme_sram.c,
+ tools/ndstool/source/raster.cpp, tools/ndstool/source/sha1.cpp,
+ touchscreen/README.reco, touchscreen/parser.c, touchscreen/reco.c,
+ touchscreen/reco.h, touchscreen/touchscreen.c,
+ touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c:
+ New files.
+
Revision 1.3 2005/09/12 06:53:27 wntrmute
fixed PlaySound
-
+
Revision 1.2 2005/08/04 17:57:58 wntrmute
playSoundBlock internal only
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/touch.c b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/touch.c
index cc527eab13..68b34e6bdd 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/touch.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/touch.c
@@ -24,15 +24,153 @@
distribution.
$Log$
+ Revision 1.1 2008/04/16 18:37:32 joel
+ 2008-04-16 Matthieu Bucchianeri <mbucchia@gmail.com>
+
+ * ChangeLog, Makefile.am, README, bsp_specs, configure.ac,
+ mk_libnds.sh, patch.libnds, preinstall.am, block/block.c,
+ clock/clock.c, console/console.c, coproc/coproc.S, coproc/coproc.c,
+ coproc/coproc.ld, dswifi/dswifi_license.txt, dswifi/makefile,
+ dswifi/arm7/makefile, dswifi/arm7/source/wifi_arm7.c,
+ dswifi/arm7/source/wifi_arm7.h, dswifi/arm9/makefile,
+ dswifi/arm9/source/sgIP.c, dswifi/arm9/source/sgIP.h,
+ dswifi/arm9/source/sgIP_ARP.c, dswifi/arm9/source/sgIP_ARP.h,
+ dswifi/arm9/source/sgIP_Config.h, dswifi/arm9/source/sgIP_DHCP.c,
+ dswifi/arm9/source/sgIP_DHCP.h, dswifi/arm9/source/sgIP_DNS.c,
+ dswifi/arm9/source/sgIP_DNS.h, dswifi/arm9/source/sgIP_Hub.c,
+ dswifi/arm9/source/sgIP_Hub.h, dswifi/arm9/source/sgIP_ICMP.c,
+ dswifi/arm9/source/sgIP_ICMP.h, dswifi/arm9/source/sgIP_IP.c,
+ dswifi/arm9/source/sgIP_IP.h, dswifi/arm9/source/sgIP_TCP.c,
+ dswifi/arm9/source/sgIP_TCP.h, dswifi/arm9/source/sgIP_UDP.c,
+ dswifi/arm9/source/sgIP_UDP.h, dswifi/arm9/source/sgIP_memblock.c,
+ dswifi/arm9/source/sgIP_memblock.h,
+ dswifi/arm9/source/sgIP_sockets.c, dswifi/arm9/source/sgIP_sockets.h,
+ dswifi/arm9/source/wifi_arm9.c, dswifi/arm9/source/wifi_arm9.h,
+ dswifi/common/source/dsregs.h, dswifi/common/source/spinlock.h,
+ dswifi/common/source/spinlock.s, dswifi/common/source/wifi_shared.h,
+ dswifi/include/dswifi7.h, dswifi/include/dswifi9.h,
+ dswifi/include/dswifi_version.h, dswifi/include/netdb.h,
+ dswifi/include/sgIP_errno.h, dswifi/include/netinet/in.h, fb/fb.c,
+ fb/fb.h, include/bsp.h, include/my_ipc.h, include/tm27.h,
+ include/types.h, include/sys/iosupport.h, irq/irq.c, irq/irq.h,
+ libfat/gba/include/fat.h, libfat/include/fat.h,
+ libfat/nds/include/fat.h, libfat/source/bit_ops.h,
+ libfat/source/cache.c, libfat/source/cache.h, libfat/source/common.h,
+ libfat/source/directory.c, libfat/source/directory.h,
+ libfat/source/fatdir.c, libfat/source/fatdir.h,
+ libfat/source/fatfile.c, libfat/source/fatfile.h,
+ libfat/source/file_allocation_table.c,
+ libfat/source/file_allocation_table.h, libfat/source/filetime.c,
+ libfat/source/filetime.h, libfat/source/libfat.c,
+ libfat/source/mem_allocate.h, libfat/source/partition.c,
+ libfat/source/partition.h, libfat/source/disc_io/disc.c,
+ libfat/source/disc_io/disc.h, libfat/source/disc_io/disc_io.h,
+ libfat/source/disc_io/io_cf_common.c,
+ libfat/source/disc_io/io_cf_common.h,
+ libfat/source/disc_io/io_dldi.h, libfat/source/disc_io/io_dldi.s,
+ libfat/source/disc_io/io_efa2.c, libfat/source/disc_io/io_efa2.h,
+ libfat/source/disc_io/io_fcsr.c, libfat/source/disc_io/io_fcsr.h,
+ libfat/source/disc_io/io_m3_common.c,
+ libfat/source/disc_io/io_m3_common.h,
+ libfat/source/disc_io/io_m3cf.c, libfat/source/disc_io/io_m3cf.h,
+ libfat/source/disc_io/io_m3sd.c, libfat/source/disc_io/io_m3sd.h,
+ libfat/source/disc_io/io_mpcf.c, libfat/source/disc_io/io_mpcf.h,
+ libfat/source/disc_io/io_njsd.c, libfat/source/disc_io/io_njsd.h,
+ libfat/source/disc_io/io_nmmc.c, libfat/source/disc_io/io_nmmc.h,
+ libfat/source/disc_io/io_sc_common.c,
+ libfat/source/disc_io/io_sc_common.h,
+ libfat/source/disc_io/io_sccf.c, libfat/source/disc_io/io_sccf.h,
+ libfat/source/disc_io/io_scsd.c, libfat/source/disc_io/io_scsd.h,
+ libfat/source/disc_io/io_scsd_s.s,
+ libfat/source/disc_io/io_sd_common.c,
+ libfat/source/disc_io/io_sd_common.h, libnds/Makefile.arm7,
+ libnds/Makefile.arm9, libnds/libnds_license.txt,
+ libnds/basicARM7/source/defaultARM7.c,
+ libnds/include/default_font_bin.h, libnds/include/gbfs.h,
+ libnds/include/nds.h, libnds/include/nds/bios.h,
+ libnds/include/nds/card.h, libnds/include/nds/dma.h,
+ libnds/include/nds/interrupts.h, libnds/include/nds/ipc.h,
+ libnds/include/nds/jtypes.h, libnds/include/nds/memory.h,
+ libnds/include/nds/registers_alt.h, libnds/include/nds/reload.h,
+ libnds/include/nds/system.h, libnds/include/nds/timers.h,
+ libnds/include/nds/arm7/audio.h, libnds/include/nds/arm7/clock.h,
+ libnds/include/nds/arm7/serial.h, libnds/include/nds/arm7/touch.h,
+ libnds/include/nds/arm9/background.h,
+ libnds/include/nds/arm9/boxtest.h, libnds/include/nds/arm9/cache.h,
+ libnds/include/nds/arm9/console.h,
+ libnds/include/nds/arm9/exceptions.h,
+ libnds/include/nds/arm9/image.h, libnds/include/nds/arm9/input.h,
+ libnds/include/nds/arm9/math.h, libnds/include/nds/arm9/ndsmotion.h,
+ libnds/include/nds/arm9/pcx.h, libnds/include/nds/arm9/postest.h,
+ libnds/include/nds/arm9/rumble.h, libnds/include/nds/arm9/sound.h,
+ libnds/include/nds/arm9/sprite.h, libnds/include/nds/arm9/trig_lut.h,
+ libnds/include/nds/arm9/video.h, libnds/include/nds/arm9/videoGL.h,
+ libnds/source/arm7/audio.c, libnds/source/arm7/clock.c,
+ libnds/source/arm7/microphone.c, libnds/source/arm7/spi.c,
+ libnds/source/arm7/touch.c, libnds/source/arm7/userSettings.c,
+ libnds/source/arm9/COS.bin, libnds/source/arm9/COS.s,
+ libnds/source/arm9/SIN.bin, libnds/source/arm9/SIN.s,
+ libnds/source/arm9/TAN.bin, libnds/source/arm9/TAN.s,
+ libnds/source/arm9/boxtest.c, libnds/source/arm9/console.c,
+ libnds/source/arm9/dcache.s, libnds/source/arm9/default_font.bin,
+ libnds/source/arm9/default_font.s,
+ libnds/source/arm9/exceptionHandler.S,
+ libnds/source/arm9/exceptionHandler.s,
+ libnds/source/arm9/exceptions.c, libnds/source/arm9/gurumeditation.c,
+ libnds/source/arm9/icache.s, libnds/source/arm9/image.c,
+ libnds/source/arm9/initSystem.c, libnds/source/arm9/keys.c,
+ libnds/source/arm9/ndsmotion.c, libnds/source/arm9/pcx.c,
+ libnds/source/arm9/rumble.c, libnds/source/arm9/sound.c,
+ libnds/source/arm9/system.c, libnds/source/arm9/touch.c,
+ libnds/source/arm9/video.c, libnds/source/arm9/videoGL.c,
+ libnds/source/common/biosCalls.s, libnds/source/common/card.c,
+ libnds/source/common/gbfs.c,
+ libnds/source/common/interruptDispatcher.s,
+ libnds/source/common/interrupts.c, rtc/rtc.c, sound/sound.c,
+ sound/sound.h, start/start.S, startup/linkcmds, startup/start.c,
+ timer/timer.c, tools/Makefile.am, tools/bin2s, tools/bin2s.c,
+ tools/configure.ac, tools/runtest,
+ tools/ndstool/include/arm7_sha1_homebrew.h,
+ tools/ndstool/include/arm7_sha1_nintendo.h,
+ tools/ndstool/include/banner.h, tools/ndstool/include/bigint.h,
+ tools/ndstool/include/crc.h, tools/ndstool/include/default_icon.h,
+ tools/ndstool/include/encryption.h, tools/ndstool/include/header.h,
+ tools/ndstool/include/hook.h, tools/ndstool/include/little.h,
+ tools/ndstool/include/loadme.h, tools/ndstool/include/logo.h,
+ tools/ndstool/include/ndscreate.h,
+ tools/ndstool/include/ndsextract.h, tools/ndstool/include/ndstool.h,
+ tools/ndstool/include/ndstree.h, tools/ndstool/include/overlay.h,
+ tools/ndstool/include/passme.h, tools/ndstool/include/passme_sram.h,
+ tools/ndstool/include/passme_vhd1.h,
+ tools/ndstool/include/passme_vhd2.h, tools/ndstool/include/raster.h,
+ tools/ndstool/include/sha1.h, tools/ndstool/include/types.h,
+ tools/ndstool/source/arm7_sha1_homebrew.c,
+ tools/ndstool/source/arm7_sha1_nintendo.c,
+ tools/ndstool/source/banner.cpp, tools/ndstool/source/bigint.cpp,
+ tools/ndstool/source/compile_date.c, tools/ndstool/source/crc.cpp,
+ tools/ndstool/source/default_icon.c,
+ tools/ndstool/source/encryption.cpp, tools/ndstool/source/header.cpp,
+ tools/ndstool/source/hook.cpp, tools/ndstool/source/loadme.c,
+ tools/ndstool/source/logo.cpp, tools/ndstool/source/ndscodes.cpp,
+ tools/ndstool/source/ndscreate.cpp,
+ tools/ndstool/source/ndsextract.cpp,
+ tools/ndstool/source/ndstool.cpp, tools/ndstool/source/ndstree.cpp,
+ tools/ndstool/source/passme.cpp, tools/ndstool/source/passme_sram.c,
+ tools/ndstool/source/raster.cpp, tools/ndstool/source/sha1.cpp,
+ touchscreen/README.reco, touchscreen/parser.c, touchscreen/reco.c,
+ touchscreen/reco.h, touchscreen/touchscreen.c,
+ touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c:
+ New files.
+
Revision 1.5 2007/05/01 22:53:09 wntrmute
remove stupid mailBusy check
-
+
Revision 1.4 2005/10/09 20:27:23 wntrmute
add check for arm7 updating IPC
-
+
Revision 1.3 2005/08/30 17:53:11 wntrmute
only include required headers
-
+
Revision 1.2 2005/08/23 17:06:10 wntrmute
converted all endings to unix
@@ -51,7 +189,7 @@
//---------------------------------------------------------------------------------
touchPosition touchReadXY() {
//---------------------------------------------------------------------------------
-
+
touchPosition touchPos;
touchPos.x = IPC->touchX;
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/videoGL.c b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/videoGL.c
index 217beb0582..c2161b4ec9 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/arm9/videoGL.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/arm9/videoGL.c
@@ -166,7 +166,7 @@ void glResetTextures(void) {
//---------------------------------------------------------------------------------
// glGenTextures creates integer names for your table
-// takes n as the number of textures to generate and
+// takes n as the number of textures to generate and
// a pointer to the names array that it needs to fill.
// Returns 1 if succesful and 0 if out of texture names
//---------------------------------------------------------------------------------
@@ -185,43 +185,43 @@ int glGenTextures(int n, int *names) {
//---------------------------------------------------------------------------------
// glBindTexure sets the current named
-// texture to the active texture. Target
+// texture to the active texture. Target
// is ignored as all DS textures are 2D
//---------------------------------------------------------------------------------
void glBindTexture(int target, int name) {
//---------------------------------------------------------------------------------
- if (name == 0)
- GFX_TEX_FORMAT = 0;
- else
- GFX_TEX_FORMAT = glGlob->textures[name];
+ if (name == 0)
+ GFX_TEX_FORMAT = 0;
+ else
+ GFX_TEX_FORMAT = glGlob->textures[name];
glGlob->activeTexture = name;
}
//---------------------------------------------------------------------------------
// glColorTable establishes the location of the current palette.
-// Roughly follows glColorTableEXT. Association of palettes with
-// named textures is left to the application.
+// Roughly follows glColorTableEXT. Association of palettes with
+// named textures is left to the application.
//---------------------------------------------------------------------------------
void glColorTable( uint8 format, uint32 addr ) {
//---------------------------------------------------------------------------------
GFX_PAL_FORMAT = addr>>(4-(format==GL_RGB4));
}
-
+
//---------------------------------------------------------------------------------
//---------------------------------------------------------------------------------
-void glTexCoord2f32(int32 u, int32 v) {
+void glTexCoord2f32(int32 u, int32 v) {
//---------------------------------------------------------------------------------
- int x, y;
+ int x, y;
- x = ((glGlob->textures[glGlob->activeTexture]) >> 20) & 7;
- y = ((glGlob->textures[glGlob->activeTexture]) >> 23) & 7;
+ x = ((glGlob->textures[glGlob->activeTexture]) >> 20) & 7;
+ y = ((glGlob->textures[glGlob->activeTexture]) >> 23) & 7;
- glTexCoord2t16(f32tot16 (mulf32(u,inttof32(8<<x))), f32tot16 (mulf32(v,inttof32(8<<y))));
+ glTexCoord2t16(f32tot16 (mulf32(u,inttof32(8<<x))), f32tot16 (mulf32(v,inttof32(8<<y))));
}
//---------------------------------------------------------------------------------
-// glTexParameter although named the same
+// glTexParameter although named the same
// as its gl counterpart it is not compatible
// Effort may be made in the future to make it so.
//---------------------------------------------------------------------------------
@@ -260,7 +260,7 @@ int getNextPaletteSlot(u16 count, uint8 format) {
uint32 result = alignVal(glGlob->nextPBlock, 1<<(4-(format==GL_RGB4)));
// convert count to bytes and align to next (smallest format) palette block
- count = alignVal( count<<1, 1<<3 );
+ count = alignVal( count<<1, 1<<3 );
// ensure that end is within palette video mem
if( result+count > 0x10000 ) // VRAM_F - VRAM_E
@@ -268,7 +268,7 @@ int getNextPaletteSlot(u16 count, uint8 format) {
glGlob->nextPBlock = result+count;
return (int)result;
-}
+}
//---------------------------------------------------------------------------------
uint16* vramGetBank(uint16 *addr) {
@@ -324,7 +324,7 @@ int vramIsTextureBank(uint16 *addr) {
}
else
return 0;
-}
+}
//---------------------------------------------------------------------------------
uint32* getNextTextureSlot(int size) {
//---------------------------------------------------------------------------------
@@ -335,7 +335,7 @@ uint32* getNextTextureSlot(int size) {
while(!vramIsTextureBank((uint16*)glGlob->nextBlock - 1) && glGlob->nextBlock <= (uint32*)VRAM_E)
{
glGlob->nextBlock = (uint32*)vramGetBank((uint16*)result) + (0x20000 >> 2); //next bank
- result = glGlob->nextBlock;
+ result = glGlob->nextBlock;
glGlob->nextBlock += size >> 2;
}
@@ -343,7 +343,7 @@ uint32* getNextTextureSlot(int size) {
result = 0;
}
return result;
-}
+}
//---------------------------------------------------------------------------------
// Similer to glTextImage2D from gl it takes a pointer to data
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/common/biosCalls.S b/c/src/lib/libbsp/arm/nds/libnds/source/common/biosCalls.S
index 5f23c83713..8d85bd784c 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/common/biosCalls.S
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/common/biosCalls.S
@@ -24,9 +24,27 @@
distribution.
$Log$
+ Revision 1.1 2008/04/17 23:09:41 joel
+ 2008-04-17 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * Makefile.am: Move .s files to .S
+ * dswifi/common/source/spinlock.S, libfat/source/disc_io/io_dldi.S,
+ libfat/source/disc_io/io_scsd_s.S, libnds/source/arm9/COS.S,
+ libnds/source/arm9/SIN.S, libnds/source/arm9/TAN.S,
+ libnds/source/arm9/dcache.S, libnds/source/arm9/default_font.S,
+ libnds/source/arm9/icache.S, libnds/source/common/biosCalls.S,
+ libnds/source/common/interruptDispatcher.S: New files.
+ * dswifi/common/source/spinlock.s, libfat/source/disc_io/io_dldi.s,
+ libfat/source/disc_io/io_scsd_s.s, libnds/source/arm9/COS.s,
+ libnds/source/arm9/SIN.s, libnds/source/arm9/TAN.s,
+ libnds/source/arm9/dcache.s, libnds/source/arm9/default_font.s,
+ libnds/source/arm9/exceptionHandler.s, libnds/source/arm9/icache.s,
+ libnds/source/common/biosCalls.s,
+ libnds/source/common/interruptDispatcher.s: Removed.
+
Revision 1.1 2008/04/16 18:37:32 joel
2008-04-16 Matthieu Bucchianeri <mbucchia@gmail.com>
-
+
* ChangeLog, Makefile.am, README, bsp_specs, configure.ac,
mk_libnds.sh, patch.libnds, preinstall.am, block/block.c,
clock/clock.c, console/console.c, coproc/coproc.S, coproc/coproc.c,
@@ -161,22 +179,22 @@
touchscreen/reco.h, touchscreen/touchscreen.c,
touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c:
New files.
-
+
Revision 1.5 2006/03/15 12:37:14 wntrmute
reformatted for legibility
grouped arm7 and arm9 specific code
-
+
Revision 1.4 2006/03/03 07:20:14 joatski
Fixed a couple of little bugs (e.g. swiSetHaltCR using r0 instead of r2 on ARM7)
Commented out ARM7 swis in ARM9 mode, and vis versa
-
+
Revision 1.3 2006/01/17 00:13:36 dovoto
Fixed swi 08 so lable and global matched "swiChangeSoundBias"
-
+
Revision 1.2 2005/09/03 13:47:13 wntrmute
added logging to header
reformatted for legibility
-
+
---------------------------------------------------------------------------------*/
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/common/card.c b/c/src/lib/libbsp/arm/nds/libnds/source/common/card.c
index a0932a3a4e..b474fed1ab 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/common/card.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/common/card.c
@@ -180,7 +180,7 @@ int cardEepromGetType(void)
c9f=cardEepromCommand(0x9f,0);
c00=cardEepromCommand(0x00,0);
- if((c00==0x00) && (c9f==0x00)) return 0; // PassMe?
+ if((c00==0x00) && (c9f==0x00)) return 0; // PassMe?
if((c00==0xff) && (c05==0xff) && (c9f==0xff))return -1;
if((c00==0xff) && (c05 & 0xFD) == 0xF0 && (c9f==0xff))return 1;
@@ -227,10 +227,10 @@ uint32 cardEepromGetSize() {
uint8 c9f;
c9f=cardEepromCommand(0x9f,0);
- if(c9f==0x14)
+ if(c9f==0x14)
return 1024*1024; // NEW TYPE 3++ 8Mbit(1024KByte)
- if(c9f==0x13)
+ if(c9f==0x13)
return 512*1024; // NEW TYPE 3+ 4Mbit(512KByte)
return 256*1024; // TYPE 3 2Mbit(256KByte)
@@ -251,8 +251,8 @@ void cardReadEeprom(uint32 address, uint8 *data, uint32 length, uint32 addrtype)
if (addrtype == 3) {
CARD_EEPDATA = (address >> 16) & 0xFF;
EepromWaitBusy();
- }
-
+ }
+
if (addrtype >= 2) {
CARD_EEPDATA = (address >> 8) & 0xFF;
EepromWaitBusy();
@@ -320,9 +320,9 @@ void cardWriteEeprom(uint32 address, uint8 *data, uint32 length, uint32 addrtype
EepromWaitBusy();
}
- for (i=0; address<address_end && i<maxblocks; i++, address++) {
- CARD_EEPDATA = *data++;
- EepromWaitBusy();
+ for (i=0; address<address_end && i<maxblocks; i++, address++) {
+ CARD_EEPDATA = *data++;
+ EepromWaitBusy();
}
CARD_CR1 = /*MODE*/0x40;
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/common/gbfs.c b/c/src/lib/libbsp/arm/nds/libnds/source/common/gbfs.c
index cc9348a4e8..0597f2dadc 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/common/gbfs.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/common/gbfs.c
@@ -28,15 +28,153 @@
IN THE SOFTWARE.
$Log$
+ Revision 1.1 2008/04/16 18:37:33 joel
+ 2008-04-16 Matthieu Bucchianeri <mbucchia@gmail.com>
+
+ * ChangeLog, Makefile.am, README, bsp_specs, configure.ac,
+ mk_libnds.sh, patch.libnds, preinstall.am, block/block.c,
+ clock/clock.c, console/console.c, coproc/coproc.S, coproc/coproc.c,
+ coproc/coproc.ld, dswifi/dswifi_license.txt, dswifi/makefile,
+ dswifi/arm7/makefile, dswifi/arm7/source/wifi_arm7.c,
+ dswifi/arm7/source/wifi_arm7.h, dswifi/arm9/makefile,
+ dswifi/arm9/source/sgIP.c, dswifi/arm9/source/sgIP.h,
+ dswifi/arm9/source/sgIP_ARP.c, dswifi/arm9/source/sgIP_ARP.h,
+ dswifi/arm9/source/sgIP_Config.h, dswifi/arm9/source/sgIP_DHCP.c,
+ dswifi/arm9/source/sgIP_DHCP.h, dswifi/arm9/source/sgIP_DNS.c,
+ dswifi/arm9/source/sgIP_DNS.h, dswifi/arm9/source/sgIP_Hub.c,
+ dswifi/arm9/source/sgIP_Hub.h, dswifi/arm9/source/sgIP_ICMP.c,
+ dswifi/arm9/source/sgIP_ICMP.h, dswifi/arm9/source/sgIP_IP.c,
+ dswifi/arm9/source/sgIP_IP.h, dswifi/arm9/source/sgIP_TCP.c,
+ dswifi/arm9/source/sgIP_TCP.h, dswifi/arm9/source/sgIP_UDP.c,
+ dswifi/arm9/source/sgIP_UDP.h, dswifi/arm9/source/sgIP_memblock.c,
+ dswifi/arm9/source/sgIP_memblock.h,
+ dswifi/arm9/source/sgIP_sockets.c, dswifi/arm9/source/sgIP_sockets.h,
+ dswifi/arm9/source/wifi_arm9.c, dswifi/arm9/source/wifi_arm9.h,
+ dswifi/common/source/dsregs.h, dswifi/common/source/spinlock.h,
+ dswifi/common/source/spinlock.s, dswifi/common/source/wifi_shared.h,
+ dswifi/include/dswifi7.h, dswifi/include/dswifi9.h,
+ dswifi/include/dswifi_version.h, dswifi/include/netdb.h,
+ dswifi/include/sgIP_errno.h, dswifi/include/netinet/in.h, fb/fb.c,
+ fb/fb.h, include/bsp.h, include/my_ipc.h, include/tm27.h,
+ include/types.h, include/sys/iosupport.h, irq/irq.c, irq/irq.h,
+ libfat/gba/include/fat.h, libfat/include/fat.h,
+ libfat/nds/include/fat.h, libfat/source/bit_ops.h,
+ libfat/source/cache.c, libfat/source/cache.h, libfat/source/common.h,
+ libfat/source/directory.c, libfat/source/directory.h,
+ libfat/source/fatdir.c, libfat/source/fatdir.h,
+ libfat/source/fatfile.c, libfat/source/fatfile.h,
+ libfat/source/file_allocation_table.c,
+ libfat/source/file_allocation_table.h, libfat/source/filetime.c,
+ libfat/source/filetime.h, libfat/source/libfat.c,
+ libfat/source/mem_allocate.h, libfat/source/partition.c,
+ libfat/source/partition.h, libfat/source/disc_io/disc.c,
+ libfat/source/disc_io/disc.h, libfat/source/disc_io/disc_io.h,
+ libfat/source/disc_io/io_cf_common.c,
+ libfat/source/disc_io/io_cf_common.h,
+ libfat/source/disc_io/io_dldi.h, libfat/source/disc_io/io_dldi.s,
+ libfat/source/disc_io/io_efa2.c, libfat/source/disc_io/io_efa2.h,
+ libfat/source/disc_io/io_fcsr.c, libfat/source/disc_io/io_fcsr.h,
+ libfat/source/disc_io/io_m3_common.c,
+ libfat/source/disc_io/io_m3_common.h,
+ libfat/source/disc_io/io_m3cf.c, libfat/source/disc_io/io_m3cf.h,
+ libfat/source/disc_io/io_m3sd.c, libfat/source/disc_io/io_m3sd.h,
+ libfat/source/disc_io/io_mpcf.c, libfat/source/disc_io/io_mpcf.h,
+ libfat/source/disc_io/io_njsd.c, libfat/source/disc_io/io_njsd.h,
+ libfat/source/disc_io/io_nmmc.c, libfat/source/disc_io/io_nmmc.h,
+ libfat/source/disc_io/io_sc_common.c,
+ libfat/source/disc_io/io_sc_common.h,
+ libfat/source/disc_io/io_sccf.c, libfat/source/disc_io/io_sccf.h,
+ libfat/source/disc_io/io_scsd.c, libfat/source/disc_io/io_scsd.h,
+ libfat/source/disc_io/io_scsd_s.s,
+ libfat/source/disc_io/io_sd_common.c,
+ libfat/source/disc_io/io_sd_common.h, libnds/Makefile.arm7,
+ libnds/Makefile.arm9, libnds/libnds_license.txt,
+ libnds/basicARM7/source/defaultARM7.c,
+ libnds/include/default_font_bin.h, libnds/include/gbfs.h,
+ libnds/include/nds.h, libnds/include/nds/bios.h,
+ libnds/include/nds/card.h, libnds/include/nds/dma.h,
+ libnds/include/nds/interrupts.h, libnds/include/nds/ipc.h,
+ libnds/include/nds/jtypes.h, libnds/include/nds/memory.h,
+ libnds/include/nds/registers_alt.h, libnds/include/nds/reload.h,
+ libnds/include/nds/system.h, libnds/include/nds/timers.h,
+ libnds/include/nds/arm7/audio.h, libnds/include/nds/arm7/clock.h,
+ libnds/include/nds/arm7/serial.h, libnds/include/nds/arm7/touch.h,
+ libnds/include/nds/arm9/background.h,
+ libnds/include/nds/arm9/boxtest.h, libnds/include/nds/arm9/cache.h,
+ libnds/include/nds/arm9/console.h,
+ libnds/include/nds/arm9/exceptions.h,
+ libnds/include/nds/arm9/image.h, libnds/include/nds/arm9/input.h,
+ libnds/include/nds/arm9/math.h, libnds/include/nds/arm9/ndsmotion.h,
+ libnds/include/nds/arm9/pcx.h, libnds/include/nds/arm9/postest.h,
+ libnds/include/nds/arm9/rumble.h, libnds/include/nds/arm9/sound.h,
+ libnds/include/nds/arm9/sprite.h, libnds/include/nds/arm9/trig_lut.h,
+ libnds/include/nds/arm9/video.h, libnds/include/nds/arm9/videoGL.h,
+ libnds/source/arm7/audio.c, libnds/source/arm7/clock.c,
+ libnds/source/arm7/microphone.c, libnds/source/arm7/spi.c,
+ libnds/source/arm7/touch.c, libnds/source/arm7/userSettings.c,
+ libnds/source/arm9/COS.bin, libnds/source/arm9/COS.s,
+ libnds/source/arm9/SIN.bin, libnds/source/arm9/SIN.s,
+ libnds/source/arm9/TAN.bin, libnds/source/arm9/TAN.s,
+ libnds/source/arm9/boxtest.c, libnds/source/arm9/console.c,
+ libnds/source/arm9/dcache.s, libnds/source/arm9/default_font.bin,
+ libnds/source/arm9/default_font.s,
+ libnds/source/arm9/exceptionHandler.S,
+ libnds/source/arm9/exceptionHandler.s,
+ libnds/source/arm9/exceptions.c, libnds/source/arm9/gurumeditation.c,
+ libnds/source/arm9/icache.s, libnds/source/arm9/image.c,
+ libnds/source/arm9/initSystem.c, libnds/source/arm9/keys.c,
+ libnds/source/arm9/ndsmotion.c, libnds/source/arm9/pcx.c,
+ libnds/source/arm9/rumble.c, libnds/source/arm9/sound.c,
+ libnds/source/arm9/system.c, libnds/source/arm9/touch.c,
+ libnds/source/arm9/video.c, libnds/source/arm9/videoGL.c,
+ libnds/source/common/biosCalls.s, libnds/source/common/card.c,
+ libnds/source/common/gbfs.c,
+ libnds/source/common/interruptDispatcher.s,
+ libnds/source/common/interrupts.c, rtc/rtc.c, sound/sound.c,
+ sound/sound.h, start/start.S, startup/linkcmds, startup/start.c,
+ timer/timer.c, tools/Makefile.am, tools/bin2s, tools/bin2s.c,
+ tools/configure.ac, tools/runtest,
+ tools/ndstool/include/arm7_sha1_homebrew.h,
+ tools/ndstool/include/arm7_sha1_nintendo.h,
+ tools/ndstool/include/banner.h, tools/ndstool/include/bigint.h,
+ tools/ndstool/include/crc.h, tools/ndstool/include/default_icon.h,
+ tools/ndstool/include/encryption.h, tools/ndstool/include/header.h,
+ tools/ndstool/include/hook.h, tools/ndstool/include/little.h,
+ tools/ndstool/include/loadme.h, tools/ndstool/include/logo.h,
+ tools/ndstool/include/ndscreate.h,
+ tools/ndstool/include/ndsextract.h, tools/ndstool/include/ndstool.h,
+ tools/ndstool/include/ndstree.h, tools/ndstool/include/overlay.h,
+ tools/ndstool/include/passme.h, tools/ndstool/include/passme_sram.h,
+ tools/ndstool/include/passme_vhd1.h,
+ tools/ndstool/include/passme_vhd2.h, tools/ndstool/include/raster.h,
+ tools/ndstool/include/sha1.h, tools/ndstool/include/types.h,
+ tools/ndstool/source/arm7_sha1_homebrew.c,
+ tools/ndstool/source/arm7_sha1_nintendo.c,
+ tools/ndstool/source/banner.cpp, tools/ndstool/source/bigint.cpp,
+ tools/ndstool/source/compile_date.c, tools/ndstool/source/crc.cpp,
+ tools/ndstool/source/default_icon.c,
+ tools/ndstool/source/encryption.cpp, tools/ndstool/source/header.cpp,
+ tools/ndstool/source/hook.cpp, tools/ndstool/source/loadme.c,
+ tools/ndstool/source/logo.cpp, tools/ndstool/source/ndscodes.cpp,
+ tools/ndstool/source/ndscreate.cpp,
+ tools/ndstool/source/ndsextract.cpp,
+ tools/ndstool/source/ndstool.cpp, tools/ndstool/source/ndstree.cpp,
+ tools/ndstool/source/passme.cpp, tools/ndstool/source/passme_sram.c,
+ tools/ndstool/source/raster.cpp, tools/ndstool/source/sha1.cpp,
+ touchscreen/README.reco, touchscreen/parser.c, touchscreen/reco.c,
+ touchscreen/reco.h, touchscreen/touchscreen.c,
+ touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c:
+ New files.
+
Revision 1.5 2006/05/05 05:32:06 wntrmute
consistency formatting
-
+
Revision 1.4 2006/02/25 02:31:12 wntrmute
tabs, not spaces
-
+
Revision 1.3 2005/09/20 04:59:44 wntrmute
*** empty log message ***
-
+
Revision 1.2 2005/08/23 17:06:10 wntrmute
converted all endings to unix
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/common/interruptDispatcher.S b/c/src/lib/libbsp/arm/nds/libnds/source/common/interruptDispatcher.S
index c971bb3b20..55a3fa2e67 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/common/interruptDispatcher.S
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/common/interruptDispatcher.S
@@ -22,9 +22,35 @@
distribution.
$Log$
+ Revision 1.2 2008/08/19 15:47:14 joel
+ 2008-08-19 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * dswifi/arm7/makefile, dswifi/include/netinet/in.h,
+ libnds/basicARM7/source/defaultARM7.c, libnds/include/gbfs.h,
+ libnds/include/nds/bios.h, libnds/include/nds/card.h,
+ libnds/include/nds/dma.h, libnds/include/nds/interrupts.h,
+ libnds/include/nds/ipc.h, libnds/include/nds/jtypes.h,
+ libnds/include/nds/registers_alt.h, libnds/include/nds/system.h,
+ libnds/include/nds/timers.h, libnds/include/nds/arm7/audio.h,
+ libnds/include/nds/arm7/clock.h, libnds/include/nds/arm7/serial.h,
+ libnds/include/nds/arm7/touch.h, libnds/include/nds/arm9/boxtest.h,
+ libnds/include/nds/arm9/cache.h, libnds/include/nds/arm9/console.h,
+ libnds/include/nds/arm9/ndsmotion.h, libnds/include/nds/arm9/video.h,
+ libnds/include/nds/arm9/videoGL.h, libnds/source/arm7/audio.c,
+ libnds/source/arm7/clock.c, libnds/source/arm7/microphone.c,
+ libnds/source/arm7/touch.c, libnds/source/arm7/userSettings.c,
+ libnds/source/arm9/boxtest.c, libnds/source/arm9/gurumeditation.c,
+ libnds/source/arm9/ndsmotion.c, libnds/source/arm9/videoGL.c,
+ libnds/source/common/card.c,
+ libnds/source/common/interruptDispatcher.S, touchscreen/reco.c: Fix
+ various warnings by fixing prototypes. Remove unused .bin files.
+ Convert all files to UNIX CF/LF.
+ * libnds/source/arm9/COS.bin, libnds/source/arm9/SIN.bin,
+ libnds/source/arm9/TAN.bin, libnds/source/arm9/default_font.bin: Removed.
+
Revision 1.1 2008/04/17 23:09:41 joel
2008-04-17 Joel Sherrill <joel.sherrill@OARcorp.com>
-
+
* Makefile.am: Move .s files to .S
* dswifi/common/source/spinlock.S, libfat/source/disc_io/io_dldi.S,
libfat/source/disc_io/io_scsd_s.S, libnds/source/arm9/COS.S,
@@ -39,10 +65,10 @@
libnds/source/arm9/exceptionHandler.s, libnds/source/arm9/icache.s,
libnds/source/common/biosCalls.s,
libnds/source/common/interruptDispatcher.s: Removed.
-
+
Revision 1.1 2008/04/16 18:37:33 joel
2008-04-16 Matthieu Bucchianeri <mbucchia@gmail.com>
-
+
* ChangeLog, Makefile.am, README, bsp_specs, configure.ac,
mk_libnds.sh, patch.libnds, preinstall.am, block/block.c,
clock/clock.c, console/console.c, coproc/coproc.S, coproc/coproc.c,
@@ -177,38 +203,38 @@
touchscreen/reco.h, touchscreen/touchscreen.c,
touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c:
New files.
-
+
Revision 1.10 2007/08/11 06:00:23 wntrmute
make nesting really work
-
+
Revision 1.9 2007/01/10 15:48:27 wntrmute
remove unused code
-
+
Revision 1.8 2006/12/16 09:10:02 wntrmute
acknowledge interrupt before calling handler
-
+
Revision 1.7 2006/04/26 05:11:31 wntrmute
rebase dtcm, take __irq_flags and __irq_vector from linker script
move arm7 irq vector & irq flags to actual locations
-
+
Revision 1.6 2006/04/23 18:19:15 wntrmute
reworked interrupt code to allow dtcm moving
-
+
Revision 1.5 2005/12/12 13:01:55 wntrmute
disable interrupts on return from user handler
-
+
Revision 1.4 2005/10/21 22:43:42 wntrmute
restore REG_IME on exit from null handler
-
+
Revision 1.3 2005/09/27 18:21:53 wntrmute
safer nested interrupt support
-
+
Revision 1.2 2005/09/04 16:37:01 wntrmute
check for NULL handler
-
+
Revision 1.1 2005/09/03 17:09:35 wntrmute
added interworking aware interrupt dispatcher
-
+
---------------------------------------------------------------------------------*/
@@ -282,7 +308,7 @@ got_handler:
msr cpsr,r2
str r0, [r3, #0x0214] @ IF Clear
-
+
push {lr}
adr lr, IntrRet
bx r1
diff --git a/c/src/lib/libbsp/arm/nds/libnds/source/common/interrupts.c b/c/src/lib/libbsp/arm/nds/libnds/source/common/interrupts.c
index 2c30b91bac..f15bae2935 100644
--- a/c/src/lib/libbsp/arm/nds/libnds/source/common/interrupts.c
+++ b/c/src/lib/libbsp/arm/nds/libnds/source/common/interrupts.c
@@ -22,9 +22,30 @@
distribution.
$Log$
+ Revision 1.2 2008/08/20 16:31:41 joel
+ 2008-08-20 Joel Sherrill <joel.sherrill@OARcorp.com>
+
+ * block/block.c, console/console.c, dswifi/arm9/source/sgIP.h,
+ dswifi/arm9/source/sgIP_ARP.h, dswifi/arm9/source/sgIP_Config.h,
+ dswifi/arm9/source/sgIP_DHCP.h, dswifi/arm9/source/sgIP_DNS.h,
+ dswifi/arm9/source/sgIP_Hub.h, dswifi/arm9/source/sgIP_ICMP.h,
+ dswifi/arm9/source/sgIP_IP.h, dswifi/arm9/source/sgIP_TCP.h,
+ dswifi/arm9/source/sgIP_UDP.h, dswifi/arm9/source/sgIP_memblock.h,
+ dswifi/arm9/source/wifi_arm9.c, dswifi/arm9/source/wifi_arm9.h,
+ dswifi/include/dswifi7.h, dswifi/include/dswifi9.h, fb/fb.c,
+ include/my_ipc.h, libfat/source/disc_io/disc_io.h,
+ libfat/source/disc_io/io_nmmc.c,
+ libnds/include/nds/arm9/exceptions.h,
+ libnds/include/nds/arm9/input.h, libnds/include/nds/arm9/ndsmotion.h,
+ libnds/include/nds/arm9/videoGL.h, libnds/source/arm9/console.c,
+ libnds/source/arm9/gurumeditation.c, libnds/source/arm9/ndsmotion.c,
+ libnds/source/common/card.c, libnds/source/common/interrupts.c,
+ sound/sound.c, startup/start.c, touchscreen/reco.h, wifi/compat.c,
+ wifi/compat.h: Fix most warnings.
+
Revision 1.1 2008/04/16 18:37:33 joel
2008-04-16 Matthieu Bucchianeri <mbucchia@gmail.com>
-
+
* ChangeLog, Makefile.am, README, bsp_specs, configure.ac,
mk_libnds.sh, patch.libnds, preinstall.am, block/block.c,
clock/clock.c, console/console.c, coproc/coproc.S, coproc/coproc.c,
@@ -159,28 +180,28 @@
touchscreen/reco.h, touchscreen/touchscreen.c,
touchscreen/touchscreen.h, wifi/compat.c, wifi/compat.h, wifi/wifi.c:
New files.
-
+
Revision 1.10 2007/02/06 12:00:32 wntrmute
use uint32 for irqEnable
-
+
Revision 1.9 2006/06/16 07:35:14 wntrmute
more moves to REG_ values
implement SetYtrigger helper function
set bits in REG_DISPSTAT for IRQ_VCOUNT
-
+
Revision 1.8 2006/02/21 00:12:35 wntrmute
clear interrupts and enable REG_IME in irqInit
-
+
Revision 1.7 2005/12/12 13:03:29 wntrmute
set/clear LCD interrupts in irqEnable/Disable
-
+
Revision 1.6 2005/11/07 01:11:08 wntrmute
more doxygen
moved IntrMain declaration to C file
-
+
Revision 1.5 2005/09/20 05:00:24 wntrmute
use new register definitions
-
+
Revision 1.4 2005/09/04 16:28:04 wntrmute
place irqTable in ewram