From 819f75fd411b7b2019945f405b539660f50cc97b Mon Sep 17 00:00:00 2001 From: Rik Veenboer Date: Sun, 20 Mar 2011 18:34:14 +0000 Subject: [PATCH] --- dev/WiiUseJ.dev | 99 ++++++++++++++++++++++++++++++++++++++++++++ dev/copy.bat | 1 + dev/copy.mak | 2 + msvc/WiiUseJ.suo | Bin 29696 -> 28672 bytes speaker.h | 22 +++++----- wiiusej_WiiUseApi.c | 2 +- 6 files changed, 114 insertions(+), 12 deletions(-) create mode 100644 dev/WiiUseJ.dev create mode 100644 dev/copy.bat create mode 100644 dev/copy.mak diff --git a/dev/WiiUseJ.dev b/dev/WiiUseJ.dev new file mode 100644 index 0000000..f34b3da --- /dev/null +++ b/dev/WiiUseJ.dev @@ -0,0 +1,99 @@ +[Project] +FileName=WiiUseJ.dev +Name=WiiUseJ +UnitCount=5 +Type=3 +Ver=1 +ObjFiles= +Includes=..\include;..\include\win32 +Libs= +PrivateResource= +ResourceIncludes= +MakeIncludes=copy.mak +Compiler=-DBUILDING_DLL=1_@@_ +CppCompiler=-DBUILDING_DLL=1_@@_ +Linker=--no-export-all-symbols --add-stdcall-alias_@@_../lib/wiiuse.lib_@@_ +IsCpp=0 +Icon= +ExeOutput= +ObjectOutput= +OverrideOutput=0 +OverrideOutputName=WiiUseJ.dll +HostApplication= +Folders= +CommandLine= +UseCustomMakefile=0 +CustomMakefile= +IncludeVersionInfo=0 +SupportXPThemes=0 +CompilerSet=0 +CompilerSettings=0000000000000000000000 + +[Unit1] +FileName=..\speaker.h +CompileCpp=0 +Folder=WiiUseJ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit2] +FileName=..\wiiuse.h +CompileCpp=0 +Folder=WiiUseJ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit3] +FileName=..\wiiusej_Speaker.h +CompileCpp=0 +Folder=WiiUseJ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit4] +FileName=..\wiiusej_WiiUseApi.c +CompileCpp=0 +Folder=WiiUseJ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[Unit5] +FileName=..\wiiusej_WiiUseApi.h +CompileCpp=0 +Folder=WiiUseJ +Compile=1 +Link=1 +Priority=1000 +OverrideBuildCmd=0 +BuildCmd= + +[VersionInfo] +Major=0 +Minor=1 +Release=1 +Build=1 +LanguageID=1033 +CharsetID=1252 +CompanyName= +FileVersion= +FileDescription=Developed using the Dev-C++ IDE +InternalName= +LegalCopyright= +LegalTrademarks= +OriginalFilename= +ProductName= +ProductVersion= +AutoIncBuildNr=0 + diff --git a/dev/copy.bat b/dev/copy.bat new file mode 100644 index 0000000..cb938a8 --- /dev/null +++ b/dev/copy.bat @@ -0,0 +1 @@ +copy WiiUseJ.dll ..\..\..\java\native\ \ No newline at end of file diff --git a/dev/copy.mak b/dev/copy.mak new file mode 100644 index 0000000..5459618 --- /dev/null +++ b/dev/copy.mak @@ -0,0 +1,2 @@ +all-after: + copy.bat \ No newline at end of file diff --git a/msvc/WiiUseJ.suo b/msvc/WiiUseJ.suo index 4b266710fbab61ad1041a77b232dd0d63e7e4616..739ff4900f420fa7b805420dccf97e67fd294145 100644 GIT binary patch delta 1074 zcma)5OH30{6n(EVQ-)9Z)Rs=9N?Y1eEG-{PO3TN#R3QSEPf-M-d?bh>R)dC56RTmt zQhHr!Oe{Nh%4}RV!qSb#r3-cC%DCvlCd7K*K#39;zUFl9IrrWB=H7QF@r@=v(^qd) zVgn(h5dmqH1RlR5HA$2Ff-sPRXqWLh22K8Buv`#@R=;&~vV2?Q zISzv$6|Dl3L4>ydd_dG7Db5Q^6$zz6M)rl)8rnRBXKNro-C5nq?xqA%gS*YJ5rVVFU10BgAqRY zL}=ti*!Ag>(ogD&)=LFzP|{iUYnBWL476b#NlEWQpOnE zGPrciI8J)7_9=1=|L+nLNuEl>hR-9-yRXONYvIPTO~DqnFTbF~>7ffi&sp%2Juqp} z!DEvhDry@3QY#@@WrGi)?{dNw=0tWBn?>cCGmRg4sBqUqrsbU+7@DSFjmBYX_z|oJ zjR)hSWEN&Hq#Df8YIqS0z+SX`+n*@V+$L@^Lt^+Nq!1nktN)0R1QV*u%9RD8=V7)( zD?b?tQ#swWA@YUj+n=;PoHW{ulzkKXZx!iNL9?L~oMx@;n2!}C#}bgRTVTs$R)%&2 zcW%Opy$&ob7SV@{b(6&kql#;Aycc%I+94EjgK3n<-be!L{!=+J@tRVzOs7-af7fa{ T(v5#sHn&s+(_L;jdG+gW08%dv delta 1565 zcmbW1O>7%Q6o6;FYkO-aG;wX$G!9w2PUHO8-F2M!C#H^L$C1*|#I#UoH-ND%Waqd3 zNt4>8E`RcR23$rhY;cg!QZ>~+QSMntK{$f@Tg6?#B5NE4~M|3 zvQt5btGWy&RCn;xPV7%0OUO0&P&H(`*+?Y6R9!+NFH+Bz=fdqT1Xr!B)!@Yd}T2Ysj~j4SrNK z6#mIQ`9MVoLvF#;agQ{tV-&2MOAR9XRGCn?se&u|GtlbngDw5r)B{*CY#(;xK#_!q zi$uvN@xZz<2vuW*x*=~B?sRiXd4(Hb@mZjH)ZB7EzjHJE)!o+5kC9KlKm2$DER4Ql zdPtR|ZPRHQHW^+i2a}Xm%tcDcqsU6z?PCl@;JPOW*DaZr09hc5Bt_=&Xqs`0u+Ei^ z>^I_v&=KgTFOxI`txv;GF&kv8I+*G1rsN}sM+L`-$KCG` zgvjmAVdf<72#pFM2hWH2u#b;Mqv8ImrNDFPTq2sDP32CN5`M9eOJ#FnHa#Qe;9jgt zom))BXHr=xT6=u&KhgaGo+~|7cg_1$cHxa|e2%NF$Jv*?gWckId?_wwk~4yH(8<5* z>KD`ViP=IjC1&Pf{dg~Q^jg5Iv%&ASR`|`T-W&b|Ln2R(`G8Fw6fV4LGhU-H`SoV2 z9%@LD|DA{boC8`;LfjUzpT&}{H+^*)<#tpexBfa0x6dsIZkHo0l^qe9l_#G-YIkUh z|B+$z4Gp#i?m(Nab6+-xN{7A9;0U@8E zEZNSEsQIeSC1EzAJ46E8<;28!sF9zT}trz8{{c^?O imALej629wOuI=Sh`d=;Zs|McDj?}!$p8t-!8t0$J&br3{ diff --git a/speaker.h b/speaker.h index 8b8267d..aad8b4e 100644 --- a/speaker.h +++ b/speaker.h @@ -2,16 +2,16 @@ #define WIIMOTE_GET_RUMBLE(wm) (WIIMOTE_IS_SET(wm, WIIMOTE_STATE_RUMBLE) ? 0x01 : 0x00) -#define WM_CMD_SPEAKER_ENABLE 0x14 -#define WM_CMD_STREAM_DATA 0x18 -#define WM_CMD_SPEAKER_MUTE 0x19 - -#define WM_CTRL_STATUS_BYTE1_SPEAKER_MUTE 0x04 - -#define WM_REG_SPEAKER 0x04a20001 - -static byte cfg[9] = {0x00, 0x00, 0x00, 0xdd, 0x40, 0x00, 0x00, 0x01, 0x01}; - +#define WM_CMD_SPEAKER_ENABLE 0x14 +#define WM_CMD_STREAM_DATA 0x18 +#define WM_CMD_SPEAKER_MUTE 0x19 + +#define WM_CTRL_STATUS_BYTE1_SPEAKER_MUTE 0x04 + +#define WM_REG_SPEAKER 0x04a20001 + +static byte cfg[9] = {0x00, 0x00, 0x00, 0xdd, 0x40, 0x00, 0x00, 0x01, 0x01}; + WIIUSE_EXPORT extern void wiiuse_speaker_enable(struct wiimote_t* wm); WIIUSE_EXPORT extern void wiiuse_speaker_disable(struct wiimote_t* wm); WIIUSE_EXPORT extern void wiiuse_speaker_mute(struct wiimote_t* wm); @@ -20,4 +20,4 @@ WIIUSE_EXPORT extern void wiiuse_speaker_activate(struct wiimote_t* wm); WIIUSE_EXPORT extern void wiiuse_speaker_deactivate(struct wiimote_t* wm); WIIUSE_EXPORT extern void wiiuse_speaker_volume(struct wiimote_t* wm, byte vol); WIIUSE_EXPORT extern void wiiuse_speaker_frequency(struct wiimote_t* wm, unsigned short freq); -WIIUSE_EXPORT extern void wiiuse_speaker_data(struct wiimote_t* wm, byte* data); \ No newline at end of file +WIIUSE_EXPORT extern void wiiuse_speaker_data(struct wiimote_t* wm, byte* data); diff --git a/wiiusej_WiiUseApi.c b/wiiusej_WiiUseApi.c index 8d28964..aa190ca 100644 --- a/wiiusej_WiiUseApi.c +++ b/wiiusej_WiiUseApi.c @@ -747,4 +747,4 @@ JNIEXPORT void JNICALL Java_wiiusej_WiiUseApi_streamSpeakerData } wiiuse_speaker_data(wiiuse_get_by_id(wiimotes, nbMaxWiimotes, id), data); (*env)->ReleaseShortArrayElements(env, sArray, jShorts, JNI_FALSE); -} \ No newline at end of file +}