Permalink
Browse files

Synchronise wth Shagkur's latest changes

git-svn-id: https://devkitpro.svn.sourceforge.net/svnroot/devkitpro/trunk/libogc@2065 258c5a1a-4f63-435d-9564-e8f6d34ab52c
  • Loading branch information...
1 parent 63c4026 commit c2266f67debb4714e5d616a3ad8ac31991896ba6 wntrmute committed Jan 31, 2008
Showing with 2,671 additions and 2,366 deletions.
  1. +4 −3 Makefile
  2. +2 −12 gc/gccore.h
  3. +0 −1 gc/gcmodplay.h
  4. +0 −1 gc/mad/bit.h
  5. +0 −1 gc/mad/decoder.h
  6. +0 −1 gc/mad/fixed.h
  7. +0 −1 gc/mad/frame.h
  8. +0 −1 gc/mad/global.h
  9. +0 −1 gc/mad/huffman.h
  10. +0 −1 gc/mad/layer12.h
  11. +0 −1 gc/mad/layer3.h
  12. +0 −16 gc/mad/mad.h
  13. +0 −1 gc/mad/stream.h
  14. +0 −1 gc/mad/synth.h
  15. +0 −1 gc/mad/timer.h
  16. +0 −1 gc/mad/version.h
  17. +3 −2 gc/mp3player.h
  18. +1 −2 gc/netif/arch/cc.h
  19. +0 −1 gc/netif/arch/cpu.h
  20. +0 −1 gc/netif/arch/init.h
  21. +0 −1 gc/netif/arch/lib.h
  22. +0 −1 gc/netif/arch/perf.h
  23. +0 −1 gc/netif/arch/sys_arch.h
  24. +0 −21 gc/ogc/aram.h
  25. +0 −13 gc/ogc/arqmgr.h
  26. +0 −9 gc/ogc/arqueue.h
  27. +1 −9 gc/ogc/audio.h
  28. +0 −15 gc/ogc/cache.h
  29. +31 −11 gc/ogc/card.h
  30. +34 −18 gc/ogc/cast.h
  31. +0 −13 gc/ogc/cond.h
  32. +3 −2 gc/ogc/context.h
  33. +25 −19 gc/ogc/dsp.h
  34. +4 −18 gc/ogc/dvd.h
  35. +0 −7 gc/ogc/exi.h
  36. +82 −14 gc/ogc/gx.h
  37. +0 −6 gc/ogc/irq.h
  38. +0 −14 gc/ogc/lwp.h
  39. +0 −14 gc/ogc/message.h
  40. +0 −14 gc/ogc/mutex.h
  41. +6 −1 gc/ogc/pad.h
  42. +0 −14 gc/ogc/semaphore.h
  43. +58 −6 gc/ogc/si.h
  44. +13 −23 gc/ogc/system.h
  45. +0 −13 gc/ogc/video.h
  46. +1 −1 gc/sdcard/card_fat.h
  47. +13 −0 gc/smb.h
  48. +0 −1 gc/tinysmb/des.h
  49. +0 −1 gc/tinysmb/lmhash.h
  50. +1 −1 gc/z/deflate.h
  51. +1 −1 gc/z/zconf.in.h
  52. +1 −1 gc/z/zutil.h
  53. +1 −1 gc/zconf.h
  54. +412 −273 libdb/debug.c
  55. +78 −110 libdb/debug_handler.S
  56. +10 −8 libdb/uIP/bba.c
  57. +3 −3 libdb/uIP/memb.c
  58. +13 −4 libdb/uIP/memr.c
  59. +16 −4 libdb/uIP/tcpip.c
  60. +0 −1 libdb/uIP/uip.h
  61. +0 −1 libdb/uIP/uip_arch.c
  62. +1 −2 libdb/uIP/uip_arch.h
  63. +17 −5 libdb/uIP/uip_arp.c
  64. +0 −1 libdb/uIP/uip_arp.h
  65. +2 −2 libdb/uIP/uip_icmp.c
  66. +1 −1 libdb/uIP/uip_icmp.h
  67. +23 −7 libdb/uIP/uip_ip.c
  68. +7 −0 libdb/uIP/uip_ip.h
  69. +7 −0 libdb/uIP/uip_netif.c
  70. +29 −11 libdb/uIP/uip_pbuf.c
  71. +39 −27 libdb/uIP/uip_tcp.c
  72. +3 −3 libdb/uIP/uipopt.h
  73. +0 −1 libmad/D.dat
  74. +0 −1 libmad/bit.c
  75. +0 −1 libmad/decoder.c
  76. +0 −1 libmad/fixed.c
  77. +0 −1 libmad/frame.c
  78. +0 −1 libmad/huffman.c
  79. +0 −1 libmad/imdct_s.dat
  80. +0 −1 libmad/layer12.c
  81. +0 −1 libmad/layer3.c
  82. +245 −131 libmad/mp3player.c
  83. +0 −1 libmad/qc_table.dat
  84. +0 −1 libmad/rq_table.dat
  85. +0 −1 libmad/sf_table.dat
  86. +0 −1 libmad/stream.c
  87. +2 −3 libmad/synth.c
  88. +0 −1 libmad/timer.c
  89. +0 −1 libmad/version.c
  90. +22 −23 libmodplay/gcmodplay.c
  91. +70 −18 libogc.prj
  92. +1 −3 libogc/aram.c
  93. +0 −15 libogc/arqmgr.c
  94. +0 −8 libogc/arqueue.c
  95. +0 −6 libogc/audio.c
  96. +0 −7 libogc/cache.c
  97. +0 −3 libogc/cache_asm.S
  98. +112 −90 libogc/card.c
  99. +1 −23 libogc/cond.c
  100. +2 −8 libogc/decrementer.c
  101. +32 −83 libogc/decrementer_handler.S
  102. +47 −7 libogc/dsp.c
  103. +73 −95 libogc/dvd.c
  104. +15 −17 libogc/exception.c
  105. +144 −115 libogc/exception_handler.S
  106. +0 −17 libogc/exi.c
  107. +1 −0 libogc/gu_psasm.S
  108. +64 −4 libogc/gx.c
  109. +1 −18 libogc/irq.c
  110. +33 −88 libogc/irq_handler.S
  111. +3 −40 libogc/lwp.c
  112. +216 −131 libogc/lwp_handler.S
  113. +1 −1 libogc/lwp_threads.c
  114. +1 −24 libogc/message.c
  115. +1 −21 libogc/mutex.c
  116. +2 −2 libogc/ogc_crt0.S
  117. +75 −90 libogc/pad.c
  118. +1 −17 libogc/semaphore.c
  119. +78 −89 libogc/si.c
  120. +45 −16 libogc/system.c
  121. +32 −26 libogc/tdf.c
  122. +0 −19 libogc/video.c
  123. +0 −7 libogc/video_asm.S
  124. +126 −126 libogcsys/console_font.c
  125. +84 −73 libsdcard/card_fat.c
  126. +118 −18 libsdcard/card_io.c
  127. +24 −14 libsdcard/sdcard.c
  128. +0 −1 libtinysmb/des.c
  129. +0 −1 libtinysmb/lmhash.c
  130. +17 −17 libtinysmb/smb.c
  131. +1 −1 libz/adler32.c
  132. +1 −1 libz/compress.c
  133. +1 −1 libz/crc32.c
  134. +1 −1 libz/deflate.c
  135. +1 −1 libz/gzio.c
  136. +1 −1 libz/trees.c
  137. +1 −1 libz/uncompr.c
  138. +1 −1 libz/zutil.c
  139. +0 −1 lwip/arch/gc/lib_arch.c
  140. +4 −4 lwip/netif/etharp.c
  141. +20 −20 lwip/network.c
  142. +4 −6 ogc.ld
View
@@ -67,7 +67,7 @@ INCLUDES := $(DEFINCS) -I$(BASEDIR)/gc/netif -I$(BASEDIR)/gc/ipv4 \
-I$(BASEDIR)/gc/z
MACHDEP := -DBIGENDIAN -DGEKKO -mcpu=750 -meabi -msdata=eabi -mhard-float -ffunction-sections -fdata-sections
-CFLAGS := -DLIBOGC_INTERNAL -DGAMECUBE -O2 -Wall $(MACHDEP) -fno-strict-aliasing $(INCLUDES)
+CFLAGS := -DLIBOGC_INTERNAL -DGAMECUBE -g -O2 -Wall $(MACHDEP) -fno-strict-aliasing $(INCLUDES)
LDFLAGS :=
#---------------------------------------------------------------------------------
@@ -119,7 +119,8 @@ MADOBJ := mp3player.o bit.o decoder.o fixed.o frame.o huffman.o \
#---------------------------------------------------------------------------------
DBOBJ := uip_ip.o uip_tcp.o uip_pbuf.o uip_netif.o uip_arp.o uip_arch.o \
- uip_icmp.o memb.o memr.o bba.o tcpip.o debug.o debug_handler.o
+ uip_icmp.o memb.o memr.o bba.o tcpip.o debug.o debug_handler.o \
+ debug_supp.o
#---------------------------------------------------------------------------------
SDCARDOBJ := sdcard.o sdcardio.o card_fat.o card_buf.o card_io.o card_uni.o
@@ -162,7 +163,7 @@ STUBSOBJ := malloc_lock_stub.o flock_supp_stub.o lock_supp_stub.o gcn_crt0.o
%.o : %.S
#---------------------------------------------------------------------------------
@echo $(notdir $<)
- @$(CC) -MMD -MF $(DEPSDIR)/$*.d $(CFLAGS) -D_LANGUAGE_ASSEMBLY -c $< -o $@
+ @$(CC) -MMD -MF $(DEPSDIR)/$*.d $(CFLAGS) -D_LANGUAGE_ASSEMBLY -Wa,-mgekko -c $< -o $@
#---------------------------------------------------------------------------------
%.o : %.s
View
@@ -1,7 +1,5 @@
/*-------------------------------------------------------------
-$Id: gccore.h,v 1.15 2007-01-11 10:51:56 wntrmute Exp $
-
gccore.h -- GC core header
Copyright (C) 2004
@@ -27,16 +25,6 @@ must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source
distribution.
-$Log: not supported by cvs2svn $
-Revision 1.14 2005/12/09 09:24:32 shagkur
-no message
-
-Revision 1.13 2005/11/24 14:28:50 shagkur
-- added copyright header(taken from libnds)
-- introduced RCS ID and LOG token
-- added DVD section to the API description list
-
-
-------------------------------------------------------------*/
@@ -48,6 +36,7 @@ Revision 1.13 2005/11/24 14:28:50 shagkur
*/
+#include "ogc/dsp.h"
#include "ogc/aram.h"
#include "ogc/arqueue.h"
#include "ogc/arqmgr.h"
@@ -64,6 +53,7 @@ Revision 1.13 2005/11/24 14:28:50 shagkur
#include "ogc/gx_struct.h"
#include "ogc/irq.h"
#include "ogc/lwp.h"
+#include "ogc/mutex.h"
#include "ogc/message.h"
#include "ogc/semaphore.h"
#include "ogc/pad.h"
View
@@ -13,7 +13,6 @@ typedef struct _modsndbuf {
u16 fmt;
u32 chans;
f32 samples;
- u32 data_len;
void *usr_data;
void (*callback)(void *,u8 *,u32);
} MODSNDBUF;
View
@@ -16,7 +16,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: bit.h,v 1.3 2005-12-09 09:27:10 shagkur Exp $
*/
# ifndef LIBMAD_BIT_H
View
@@ -16,7 +16,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: decoder.h,v 1.3 2005-12-09 09:27:10 shagkur Exp $
*/
# ifndef LIBMAD_DECODER_H
View
@@ -16,7 +16,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: fixed.h,v 1.3 2005-12-09 09:27:10 shagkur Exp $
*/
# ifndef LIBMAD_FIXED_H
View
@@ -16,7 +16,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: frame.h,v 1.3 2005-12-09 09:27:10 shagkur Exp $
*/
# ifndef LIBMAD_FRAME_H
View
@@ -16,7 +16,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: global.h,v 1.3 2005-12-09 09:27:10 shagkur Exp $
*/
# ifndef LIBMAD_GLOBAL_H
View
@@ -16,7 +16,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: huffman.h,v 1.3 2005-12-09 09:27:10 shagkur Exp $
*/
# ifndef LIBMAD_HUFFMAN_H
View
@@ -16,7 +16,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: layer12.h,v 1.3 2005-12-09 09:27:10 shagkur Exp $
*/
# ifndef LIBMAD_LAYER12_H
View
@@ -16,7 +16,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: layer3.h,v 1.3 2005-12-09 09:27:10 shagkur Exp $
*/
# ifndef LIBMAD_LAYER3_H
View
@@ -33,8 +33,6 @@ extern "C" {
# define SIZEOF_LONG_LONG 8
-/* Id: version.h,v 1.24 2003/05/27 22:40:37 rob Exp */
-
# ifndef LIBMAD_VERSION_H
# define LIBMAD_VERSION_H
@@ -62,8 +60,6 @@ extern s8 const mad_build[];
# endif
-/* Id: fixed.h,v 1.36 2003/05/28 04:36:00 rob Exp */
-
# ifndef LIBMAD_FIXED_H
# define LIBMAD_FIXED_H
@@ -528,8 +524,6 @@ mad_fixed_t mad_f_div(mad_fixed_t, mad_fixed_t);
# endif
-/* Id: bit.h,v 1.11 2003/05/27 22:40:36 rob Exp */
-
# ifndef LIBMAD_BIT_H
# define LIBMAD_BIT_H
@@ -557,8 +551,6 @@ u16 mad_bit_crc(struct mad_bitptr, u32, u16);
# endif
-/* Id: timer.h,v 1.15 2003/05/27 22:40:37 rob Exp */
-
# ifndef LIBMAD_TIMER_H
# define LIBMAD_TIMER_H
@@ -639,8 +631,6 @@ void mad_timer_string(mad_timer_t, s8 *, s8 const *,
# endif
-/* Id: stream.h,v 1.18 2003/05/27 22:40:37 rob Exp */
-
# ifndef LIBMAD_STREAM_H
# define LIBMAD_STREAM_H
@@ -727,8 +717,6 @@ s8 const *mad_stream_errorstr(struct mad_stream const *);
# endif
-/* Id: frame.h,v 1.19 2003/05/27 22:40:36 rob Exp */
-
# ifndef LIBMAD_FRAME_H
# define LIBMAD_FRAME_H
@@ -824,8 +812,6 @@ void mad_frame_mute(struct mad_frame *);
# endif
-/* Id: synth.h,v 1.14 2003/05/27 22:40:37 rob Exp */
-
# ifndef LIBMAD_SYNTH_H
# define LIBMAD_SYNTH_H
@@ -873,8 +859,6 @@ void mad_synth_frame(struct mad_synth *, struct mad_frame const *);
# endif
-/* Id: decoder.h,v 1.16 2003/05/27 22:40:36 rob Exp */
-
# ifndef LIBMAD_DECODER_H
# define LIBMAD_DECODER_H
View
@@ -16,7 +16,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: stream.h,v 1.4 2005-12-09 09:27:10 shagkur Exp $
*/
# ifndef LIBMAD_STREAM_H
View
@@ -16,7 +16,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: synth.h,v 1.3 2005-12-09 09:27:10 shagkur Exp $
*/
# ifndef LIBMAD_SYNTH_H
View
@@ -16,7 +16,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: timer.h,v 1.4 2005-12-09 09:27:10 shagkur Exp $
*/
# ifndef LIBMAD_TIMER_H
View
@@ -16,7 +16,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
- * $Id: version.h,v 1.3 2005-12-09 09:27:10 shagkur Exp $
*/
# ifndef LIBMAD_VERSION_H
View
@@ -1,17 +1,18 @@
#ifndef __MP3PLAYER_H__
#define __MP3PLAYER_H__
+#include <mad/mad.h>
#include <gctypes.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
void MP3Player_Init();
-s32 MP3Player_Play(const void *MP3Stream,u32 Length);
-s32 MP3Player_PlayFile(s32 (*reader)(void *,s32));
void MP3Player_Stop();
BOOL MP3Player_IsPlaying();
+s32 MP3Player_PlayBuffer(const void *buffer,s32 len,void (*filterfunc)(struct mad_stream *,struct mad_frame *));
+s32 MP3Player_PlayFile(void *cb_data,s32 (*reader)(void *,void *,s32),void (*filterfunc)(struct mad_stream *,struct mad_frame *));
#ifdef __cplusplus
}
View
@@ -30,7 +30,6 @@
*
* Author: Adam Dunkels <adam@sics.se>
*
- * $Id: cc.h,v 1.4 2005-06-06 07:23:52 shagkur Exp $
*/
#ifndef __ARCH_CC_H__
#define __ARCH_CC_H__
@@ -50,7 +49,7 @@ typedef s32 s32_t;
typedef u32 mem_ptr_t;
-#define PACK_STRUCT_FIELD(x) x __attribute__((packed))
+#define PACK_STRUCT_FIELD(x) x
#define PACK_STRUCT_STRUCT __attribute__((packed))
#define PACK_STRUCT_BEGIN
#define PACK_STRUCT_END
View
@@ -30,7 +30,6 @@
*
* Author: Adam Dunkels <adam@sics.se>
*
- * $Id: cpu.h,v 1.3 2005-12-09 09:27:40 shagkur Exp $
*/
#ifndef __CPU_H__
#define __CPU_H__
@@ -30,7 +30,6 @@
*
* Author: Adam Dunkels <adam@sics.se>
*
- * $Id: init.h,v 1.3 2005-12-09 09:27:40 shagkur Exp $
*/
#ifndef __ARCH_INIT_H__
#define __ARCH_INIT_H__
View
@@ -30,7 +30,6 @@
*
* Author: Adam Dunkels <adam@sics.se>
*
- * $Id: lib.h,v 1.3 2005-12-09 09:27:40 shagkur Exp $
*/
#ifndef __LIB_H__
#define __LIB_H__
@@ -30,7 +30,6 @@
*
* Author: Adam Dunkels <adam@sics.se>
*
- * $Id: perf.h,v 1.3 2005-12-09 09:27:40 shagkur Exp $
*/
#ifndef __PERF_H__
#define __PERF_H__
@@ -30,7 +30,6 @@
*
* Author: Adam Dunkels <adam@sics.se>
*
- * $Id: sys_arch.h,v 1.4 2006-05-02 09:41:40 shagkur Exp $
*/
#ifndef __SYS_GC_H__
#define __SYS_GC_H__
View
@@ -1,7 +1,5 @@
/*-------------------------------------------------------------
-$Id: aram.h,v 1.9 2007-01-11 10:51:56 wntrmute Exp $
-
aram.h -- ARAM subsystem
Copyright (C) 2004
@@ -27,25 +25,6 @@ must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source
distribution.
-$Log: not supported by cvs2svn $
-Revision 1.8 2005/12/09 09:20:49 shagkur
-no message
-
-Revision 1.7 2005/11/23 16:46:21 shagkur
-- more detailed description to certain functions done
-
-Revision 1.6 2005/11/23 07:50:15 shagkur
-- added more detailed description to AR_Init
-
-Revision 1.5 2005/11/22 14:05:42 shagkur
-- added copyright header (taken from libnds)
-- introduced CVS ID and LOG token
-- started doxygen styled documentation
-
-Revision 1.4 2005/11/21 10:49:01 shagkur
-no message
-
-
-------------------------------------------------------------*/
View
@@ -1,6 +1,5 @@
/*-------------------------------------------------------------
-$Id: arqmgr.h,v 1.9 2006-04-10 05:35:05 shagkur Exp $
arqmgr.h -- ARAM task queue management
@@ -27,18 +26,6 @@ must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source
distribution.
-$Log: not supported by cvs2svn $
-Revision 1.8 2005/12/09 09:20:49 shagkur
-no message
-
-Revision 1.7 2005/11/22 14:00:37 shagkur
-- small typo fix
-
-Revision 1.6 2005/11/22 13:58:25 shagkur
-- added copyright header (taken from libnds)
-- introduced CVS ID and LOG token
-- started doxygen styled documenation
-
-------------------------------------------------------------*/
Oops, something went wrong. Retry.

0 comments on commit c2266f6

Please sign in to comment.