mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 09:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Wiiuse) Meet license demands + some minor tweaks

Browse Source
This commit is contained in:
twinaphex 2013-01-07 05:33:41 +01:00
parent a67c247ebc
commit ae7b8f7250
21 changed files with 96 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wii/wiiuse/classic.c
View File

@ -31,6 +31,9 @@
* @brief Classic controller expansion device. * @brief Classic controller expansion device.
*/ */
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>

3
wii/wiiuse/classic.h
View File

@ -31,6 +31,9 @@
* @brief Classic controller expansion device. * @brief Classic controller expansion device.
*/ */
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#ifndef CLASSIC_H_INCLUDED #ifndef CLASSIC_H_INCLUDED
#define CLASSIC_H_INCLUDED #define CLASSIC_H_INCLUDED

3
wii/wiiuse/dynamics.h
View File

@ -35,6 +35,9 @@
* motion sensing. * motion sensing.
*/ */
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#ifndef DYNAMICS_H_INCLUDED #ifndef DYNAMICS_H_INCLUDED
#define DYNAMICS_H_INCLUDED #define DYNAMICS_H_INCLUDED

3
wii/wiiuse/events.c
View File

@ -1,3 +1,6 @@
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#include <stdio.h> #include <stdio.h>
#ifndef WIN32 #ifndef WIN32

3
wii/wiiuse/events.h
View File

@ -1,3 +1,6 @@
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#ifndef __EVENTS_H__ #ifndef __EVENTS_H__
#define __EVENTS_H__ #define __EVENTS_H__

3
wii/wiiuse/io.c
View File

@ -1,3 +1,6 @@
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

3
wii/wiiuse/io.h
View File

@ -1,3 +1,6 @@
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#ifndef __IO_H__ #ifndef __IO_H__
#define __IO_H__ #define __IO_H__

3
wii/wiiuse/io_wii.c
View File

@ -1,3 +1,6 @@
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#ifdef GEKKO #ifdef GEKKO
#include <stdio.h> #include <stdio.h>

3
wii/wiiuse/ir.c
View File

@ -1,3 +1,6 @@
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include <time.h> #include <time.h>

3
wii/wiiuse/ir.h
View File

@ -1,3 +1,6 @@
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#ifndef __IR_H__ #ifndef __IR_H__
#define __IR_H__ #define __IR_H__

8
wii/wiiuse/lwp_priority.inl
View File

@ -1,7 +1,7 @@
#ifndef __LWP_PRIORITY_INL__ #ifndef __LWP_PRIORITY_INL__
#define __LWP_PRIORITY_INL__ #define __LWP_PRIORITY_INL__
static __inline__ void __lwp_priomap_init(prio_cntrl *theprio,u32 prio) static inline void __lwp_priomap_init(prio_cntrl *theprio,u32 prio)
{ {
u32 major,minor,mask; u32 major,minor,mask;
@ -22,20 +22,20 @@ static __inline__ void __lwp_priomap_init(prio_cntrl *theprio,u32 prio)
#endif #endif
} }
static __inline__ void __lwp_priomap_addto(prio_cntrl *theprio) static inline void __lwp_priomap_addto(prio_cntrl *theprio)
{ {
*theprio->minor |= theprio->ready_minor; *theprio->minor |= theprio->ready_minor;
_prio_major_bitmap |= theprio->ready_major; _prio_major_bitmap |= theprio->ready_major;
} }
static __inline__ void __lwp_priomap_removefrom(prio_cntrl *theprio) static inline void __lwp_priomap_removefrom(prio_cntrl *theprio)
{ {
*theprio->minor &= theprio->block_minor; *theprio->minor &= theprio->block_minor;
if(*theprio->minor==0) if(*theprio->minor==0)
_prio_major_bitmap &= theprio->block_major; _prio_major_bitmap &= theprio->block_major;
} }
static __inline__ u32 __lwp_priomap_highest() static inline u32 __lwp_priomap_highest()
{ {
u32 major,minor; u32 major,minor;
major = cntlzw(_prio_major_bitmap); major = cntlzw(_prio_major_bitmap);

3
wii/wiiuse/motion_plus.c
View File

@ -1,3 +1,6 @@
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>

3
wii/wiiuse/motion_plus.h
View File

@ -3,6 +3,9 @@
* @brief Motion plus extension * @brief Motion plus extension
*/ */
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#ifndef MOTION_PLUS_H_INCLUDED #ifndef MOTION_PLUS_H_INCLUDED
#define MOTION_PLUS_H_INCLUDED #define MOTION_PLUS_H_INCLUDED

3
wii/wiiuse/nunchuk.c
View File

@ -1,3 +1,6 @@
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <math.h> #include <math.h>

3
wii/wiiuse/nunchuk.h
View File

@ -1,3 +1,6 @@
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#ifndef __NUNCHUK_H__ #ifndef __NUNCHUK_H__
#define __NUNCHUK_H__ #define __NUNCHUK_H__

3
wii/wiiuse/os.h
View File

@ -1,3 +1,6 @@
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#ifndef __OS_H__ #ifndef __OS_H__
#define __OS_H__ #define __OS_H__

3
wii/wiiuse/speaker.c
View File

@ -1,3 +1,6 @@
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#include <stdio.h> #include <stdio.h>
#include <math.h> #include <math.h>
#include <string.h> #include <string.h>

3
wii/wiiuse/speaker.h
View File

@ -1,3 +1,6 @@
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#ifndef __SPEAKER_H__ #ifndef __SPEAKER_H__
#define __SPEAKER_H__ #define __SPEAKER_H__

3
wii/wiiuse/wiiuse.c
View File

@ -1,3 +1,6 @@
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>

3
wii/wiiuse/wiiuse_internal.h
View File

@ -41,6 +41,9 @@
* internally, wiiuse.h is included only here. * internally, wiiuse.h is included only here.
*/ */
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#ifndef WIIUSE_INTERNAL_H_INCLUDED #ifndef WIIUSE_INTERNAL_H_INCLUDED
#define WIIUSE_INTERNAL_H_INCLUDED #define WIIUSE_INTERNAL_H_INCLUDED

39
wii/wiiuse/wpad.c
View File

@ -28,6 +28,9 @@ distribution.
-------------------------------------------------------------*/ -------------------------------------------------------------*/
/* This source as presented is a modified version of original wiiuse for use
* with RetroArch, and must not be confused with the original software. */
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -78,13 +81,17 @@ struct _wpad_cb {
s32 speaker_enabled; s32 speaker_enabled;
struct _wpad_thresh thresh; struct _wpad_thresh thresh;
#ifdef HAVE_WIIUSE_SPEAKER
void *sound_data; void *sound_data;
u32 sound_len; u32 sound_len;
u32 sound_off; u32 sound_off;
syswd_t sound_alarm; syswd_t sound_alarm;
#endif
WPADData lstate; WPADData lstate;
#ifdef HAVE_WIIUSE_QUEUE_EXT
WPADData *queue_ext; WPADData *queue_ext;
#endif
WPADData queue_int[EVENTQUEUE_LENGTH]; WPADData queue_int[EVENTQUEUE_LENGTH];
}; };
@ -495,10 +502,14 @@ static void __wpad_eventCB(struct wiimote_t *wm,s32 event)
chan = wm->unid; chan = wm->unid;
wpdcb = &__wpdcb[chan]; wpdcb = &__wpdcb[chan];
#ifdef HAVE_WIIUSE_QUEUE_EXT
if(wpdcb->queue_ext!=NULL) { if(wpdcb->queue_ext!=NULL) {
maxbufs = wpdcb->queue_length; maxbufs = wpdcb->queue_length;
wpadd = &(wpdcb->queue_ext[wpdcb->queue_tail]); wpadd = &(wpdcb->queue_ext[wpdcb->queue_tail]);
} else { }
else
#endif
{
maxbufs = EVENTQUEUE_LENGTH; maxbufs = EVENTQUEUE_LENGTH;
wpadd = &(wpdcb->queue_int[wpdcb->queue_tail]); wpadd = &(wpdcb->queue_int[wpdcb->queue_tail]);
} }
@ -546,7 +557,9 @@ static void __wpad_eventCB(struct wiimote_t *wm,s32 event)
wpdcb->queue_tail = 0; wpdcb->queue_tail = 0;
wpdcb->queue_full = 0; wpdcb->queue_full = 0;
wpdcb->queue_length = 0; wpdcb->queue_length = 0;
#ifdef HAVE_WIIUSE_QUEUE_EXT
wpdcb->queue_ext = NULL; wpdcb->queue_ext = NULL;
#endif
wpdcb->idle_time = -1; wpdcb->idle_time = -1;
memset(&wpdcb->lstate,0,sizeof(WPADData)); memset(&wpdcb->lstate,0,sizeof(WPADData));
memset(&wpaddata[chan],0,sizeof(WPADData)); memset(&wpaddata[chan],0,sizeof(WPADData));
@ -600,12 +613,14 @@ s32 WPAD_Init()
__wpdcb[i].thresh.js = WPAD_THRESH_DEFAULT_JOYSTICK; __wpdcb[i].thresh.js = WPAD_THRESH_DEFAULT_JOYSTICK;
__wpdcb[i].thresh.mp = WPAD_THRESH_DEFAULT_MOTION_PLUS; __wpdcb[i].thresh.mp = WPAD_THRESH_DEFAULT_MOTION_PLUS;
#ifdef HAVE_WIIUSE_SPEAKER
if (SYS_CreateAlarm(&__wpdcb[i].sound_alarm) < 0) if (SYS_CreateAlarm(&__wpdcb[i].sound_alarm) < 0)
{ {
WPAD_Shutdown(); WPAD_Shutdown();
_CPU_ISR_Restore(level); _CPU_ISR_Restore(level);
return WPAD_ERR_UNKNOWN; return WPAD_ERR_UNKNOWN;
} }
#endif
} }
if(CONF_GetPadDevices(&__wpad_devs) < 0) { if(CONF_GetPadDevices(&__wpad_devs) < 0) {
@ -676,10 +691,14 @@ s32 WPAD_ReadEvent(s32 chan, WPADData *data)
if(__wpads[chan] && WIIMOTE_IS_SET(__wpads[chan],WIIMOTE_STATE_CONNECTED)) { if(__wpads[chan] && WIIMOTE_IS_SET(__wpads[chan],WIIMOTE_STATE_CONNECTED)) {
if(WIIMOTE_IS_SET(__wpads[chan],WIIMOTE_STATE_HANDSHAKE_COMPLETE)) { if(WIIMOTE_IS_SET(__wpads[chan],WIIMOTE_STATE_HANDSHAKE_COMPLETE)) {
wpdcb = &__wpdcb[chan]; wpdcb = &__wpdcb[chan];
#ifdef HAVE_WIIUSE_QUEUE_EXT
if(wpdcb->queue_ext!=NULL) { if(wpdcb->queue_ext!=NULL) {
maxbufs = wpdcb->queue_length; maxbufs = wpdcb->queue_length;
wpadd = wpdcb->queue_ext; wpadd = wpdcb->queue_ext;
} else { }
else
#endif
{
maxbufs = EVENTQUEUE_LENGTH; maxbufs = EVENTQUEUE_LENGTH;
wpadd = wpdcb->queue_int; wpadd = wpdcb->queue_int;
} }
@ -710,6 +729,7 @@ s32 WPAD_ReadEvent(s32 chan, WPADData *data)
return 0; return 0;
} }
#if 0
s32 WPAD_DroppedEvents(s32 chan) s32 WPAD_DroppedEvents(s32 chan)
{ {
u32 level; u32 level;
@ -761,6 +781,7 @@ s32 WPAD_Flush(s32 chan)
if(ret == WPAD_ERR_QUEUE_EMPTY) return count; if(ret == WPAD_ERR_QUEUE_EMPTY) return count;
return ret; return ret;
} }
#endif
s32 WPAD_ReadPending(s32 chan, WPADDataCallback datacb) s32 WPAD_ReadPending(s32 chan, WPADDataCallback datacb)
{ {
@ -786,6 +807,7 @@ s32 WPAD_ReadPending(s32 chan, WPADDataCallback datacb)
return ret; return ret;
} }
#if 0
s32 WPAD_SetDataFormat(s32 chan, s32 fmt) s32 WPAD_SetDataFormat(s32 chan, s32 fmt)
{ {
u32 level; u32 level;
@ -823,6 +845,7 @@ s32 WPAD_SetDataFormat(s32 chan, s32 fmt)
_CPU_ISR_Restore(level); _CPU_ISR_Restore(level);
return WPAD_ERR_NONE; return WPAD_ERR_NONE;
} }
#endif
s32 WPAD_SetMotionPlus(s32 chan, u8 enable) s32 WPAD_SetMotionPlus(s32 chan, u8 enable)
{ {
@ -898,7 +921,7 @@ s32 WPAD_Probe(s32 chan,u32 *type)
u32 level,dev; u32 level,dev;
wiimote *wm = NULL; wiimote *wm = NULL;
if(chan<WPAD_CHAN_0 || chan>=WPAD_MAX_WIIMOTES) return WPAD_ERR_BAD_CHANNEL; //if(chan<WPAD_CHAN_0 || chan>=WPAD_MAX_WIIMOTES) return WPAD_ERR_BAD_CHANNEL;
_CPU_ISR_Disable(level); _CPU_ISR_Disable(level);
if(__wpads_inited==WPAD_STATE_DISABLED) { if(__wpads_inited==WPAD_STATE_DISABLED) {
@ -928,7 +951,8 @@ s32 WPAD_Probe(s32 chan,u32 *type)
return ret; return ret;
} }
#ifdef HAVE_WIIUSE_QUEUE_EXT
s32 WPAD_SetEventBufs(s32 chan, WPADData *bufs, u32 cnt) s32 WPAD_SetEventBufs(s32 chan, WPADData *bufs, u32 cnt)
{ {
u32 level; u32 level;
@ -946,6 +970,7 @@ s32 WPAD_SetEventBufs(s32 chan, WPADData *bufs, u32 cnt)
_CPU_ISR_Restore(level); _CPU_ISR_Restore(level);
return WPAD_ERR_NONE; return WPAD_ERR_NONE;
} }
#endif
void WPAD_SetPowerButtonCallback(WPADShutdownCallback cb) void WPAD_SetPowerButtonCallback(WPADShutdownCallback cb)
{ {
@ -1007,7 +1032,9 @@ void WPAD_Shutdown()
SYS_RemoveAlarm(__wpad_timer); SYS_RemoveAlarm(__wpad_timer);
for(i=0;i<WPAD_MAX_WIIMOTES;i++) { for(i=0;i<WPAD_MAX_WIIMOTES;i++) {
wpdcb = &__wpdcb[i]; wpdcb = &__wpdcb[i];
#ifdef HAVE_WIIUSE_SPEAKER
SYS_RemoveAlarm(wpdcb->sound_alarm); SYS_RemoveAlarm(wpdcb->sound_alarm);
#endif
__wpad_disconnect(wpdcb); __wpad_disconnect(wpdcb);
} }
@ -1066,6 +1093,7 @@ s32 WPAD_Rumble(s32 chan, int status)
} }
#endif #endif
#if 0
s32 WPAD_SetIdleThresholds(s32 chan, s32 btns, s32 ir, s32 accel, s32 js, s32 wb, s32 mp) s32 WPAD_SetIdleThresholds(s32 chan, s32 btns, s32 ir, s32 accel, s32 js, s32 wb, s32 mp)
{ {
int i; int i;
@ -1097,6 +1125,7 @@ s32 WPAD_SetIdleThresholds(s32 chan, s32 btns, s32 ir, s32 accel, s32 js, s32 wb
_CPU_ISR_Restore(level); _CPU_ISR_Restore(level);
return WPAD_ERR_NONE; return WPAD_ERR_NONE;
} }
#endif
#ifdef HAVE_WIIUSE_SPEAKER #ifdef HAVE_WIIUSE_SPEAKER
s32 WPAD_ControlSpeaker(s32 chan,s32 enable) s32 WPAD_ControlSpeaker(s32 chan,s32 enable)
@ -1155,6 +1184,7 @@ s32 WPAD_IsSpeakerEnabled(s32 chan)
} }
#endif #endif
#if 0
s32 WPAD_SendStreamData(s32 chan,void *buf,u32 len) s32 WPAD_SendStreamData(s32 chan,void *buf,u32 len)
{ {
u32 level; u32 level;
@ -1187,6 +1217,7 @@ s32 WPAD_SendStreamData(s32 chan,void *buf,u32 len)
_CPU_ISR_Restore(level); _CPU_ISR_Restore(level);
return WPAD_ERR_NONE; return WPAD_ERR_NONE;
} }
#endif
#ifdef HAVE_WIIUSE_SPEAKER #ifdef HAVE_WIIUSE_SPEAKER
void WPAD_EncodeData(WPADEncStatus *info,u32 flag,const s16 *pcmSamples,s32 numSamples,u8 *encData) void WPAD_EncodeData(WPADEncStatus *info,u32 flag,const s16 *pcmSamples,s32 numSamples,u8 *encData)