rik/libwiiuse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

banish all c++-style comments

Browse Source
This commit is contained in:
Ryan Pavlik
2011-09-14 09:42:00 -05:00
parent 9763c37525
commit adbc96318b
25 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
example-sdl/sdl.c
View File

@@ -23,24 +23,24 @@
#include <wiiuse.h> #include <wiiuse.h>
#include <SDL.h> // for SDL_Init, SDL_Quit #include <SDL.h> /* for SDL_Init, SDL_Quit */
#include <SDL_error.h> // for SDL_GetError #include <SDL_error.h> /* for SDL_GetError */
#include <SDL_events.h> // for SDL_Event, SDL_PollEvent, etc #include <SDL_events.h> /* for SDL_Event, SDL_PollEvent, etc */
#include <SDL_video.h> // for SDL_GL_SetAttribute, etc #include <SDL_video.h> /* for SDL_GL_SetAttribute, etc */
#include <GL/gl.h> // for glVertex3f, GLfloat, etc #include <GL/gl.h> /* for glVertex3f, GLfloat, etc */
#include <GL/glu.h> // for gluLookAt, gluOrtho2D, etc #include <GL/glu.h> /* for gluLookAt, gluOrtho2D, etc */
#include <GL/glut.h> // for glutSolidTeapot #include <GL/glut.h> /* for glutSolidTeapot */
#ifndef WIIUSE_WIN32 #ifndef WIIUSE_WIN32
#include <sys/time.h> // for timeval, gettimeofday #include <sys/time.h> /* for timeval, gettimeofday */
#include <time.h> // for time #include <time.h> /* for time */
#include <unistd.h> // for usleep #include <unistd.h> /* for usleep */
#else #else
#include <windows.h> #include <windows.h>
#endif #endif
#include <stdio.h> // for printf #include <stdio.h> /* for printf */
#define PI 3.14159265358979323846 #define PI 3.14159265358979323846
#define PI_DIV_180 0.017453292519943296 #define PI_DIV_180 0.017453292519943296
@@ -326,7 +326,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
int found, connected; int found, connected;
int wm; int wm;
//printf("wiiuse version = %s\n", wiiuse_version()); /* printf("wiiuse version = %s\n", wiiuse_version()); */
wiimotes = wiiuse_init(MAX_WIIMOTES); wiimotes = wiiuse_init(MAX_WIIMOTES);
found = wiiuse_find(wiimotes, MAX_WIIMOTES, 5); found = wiiuse_find(wiimotes, MAX_WIIMOTES, 5);

16
example/example.c
View File

@@ -34,13 +34,13 @@
* This file is an example of how to use the wiiuse library. * This file is an example of how to use the wiiuse library.
*/ */
#include <stdio.h> // for printf #include <stdio.h> /* for printf */
#ifndef WIN32 #ifndef WIN32
#include <unistd.h> // for usleep #include <unistd.h> /* for usleep */
#endif #endif
#include "wiiuse.h" // for wiimote_t, classic_ctrl_t, etc #include "wiiuse.h" /* for wiimote_t, classic_ctrl_t, etc */
#define MAX_WIIMOTES 4 #define MAX_WIIMOTES 4
@@ -187,8 +187,8 @@ void handle_event(struct wiimote_t* wm) {
float x = ((wb->tr + wb->br) / total) * 2 - 1; float x = ((wb->tr + wb->br) / total) * 2 - 1;
float y = ((wb->tl + wb->tr) / total) * 2 - 1; float y = ((wb->tl + wb->tr) / total) * 2 - 1;
printf("Weight: %f kg @ (%f, %f)\n", total, x, y); printf("Weight: %f kg @ (%f, %f)\n", total, x, y);
//printf("Interpolated weight: TL:%f TR:%f BL:%f BR:%f\n", wb->tl, wb->tr, wb->bl, wb->br); /* printf("Interpolated weight: TL:%f TR:%f BL:%f BR:%f\n", wb->tl, wb->tr, wb->bl, wb->br); */
//printf("Raw: TL:%d TR:%d BL:%d BR:%d\n", wb->rtl, wb->rtr, wb->rbl, wb->rbr); /* printf("Raw: TL:%d TR:%d BL:%d BR:%d\n", wb->rtl, wb->rtr, wb->rbl, wb->rbr); */
} }
} }
@@ -353,7 +353,7 @@ int main(int argc, char** argv) {
* if any expansions are plugged into the wiimote or * if any expansions are plugged into the wiimote or
* what LEDs are lit. * what LEDs are lit.
*/ */
//wiiuse_status(wiimotes[0]); /* wiiuse_status(wiimotes[0]); */
/* /*
* This is the main loop * This is the main loop
@@ -406,8 +406,8 @@ int main(int argc, char** argv) {
* threshold values. By default they are the same * threshold values. By default they are the same
* as the wiimote. * as the wiimote.
*/ */
//wiiuse_set_nunchuk_orient_threshold((struct nunchuk_t*)&wiimotes[i]->exp.nunchuk, 90.0f); /* wiiuse_set_nunchuk_orient_threshold((struct nunchuk_t*)&wiimotes[i]->exp.nunchuk, 90.0f); */
//wiiuse_set_nunchuk_accel_threshold((struct nunchuk_t*)&wiimotes[i]->exp.nunchuk, 100); /* wiiuse_set_nunchuk_accel_threshold((struct nunchuk_t*)&wiimotes[i]->exp.nunchuk, 100); */
printf("Nunchuk inserted.\n"); printf("Nunchuk inserted.\n");
break; break;

8
src/classic.c
View File

@@ -32,11 +32,11 @@
*/ */
#include "classic.h" #include "classic.h"
#include "dynamics.h" // for calc_joystick_state #include "dynamics.h" /* for calc_joystick_state */
#include "events.h" // for handshake_expansion #include "events.h" /* for handshake_expansion */
#include <stdlib.h> // for malloc #include <stdlib.h> /* for malloc */
#include <string.h> // for memset #include <string.h> /* for memset */
static void classic_ctrl_pressed_buttons(struct classic_ctrl_t* cc, short now); static void classic_ctrl_pressed_buttons(struct classic_ctrl_t* cc, short now);

2
src/classic.h
View File

@@ -53,4 +53,4 @@ void classic_ctrl_event(struct classic_ctrl_t* cc, byte* msg);
} }
#endif #endif
#endif // CLASSIC_H_INCLUDED #endif /* CLASSIC_H_INCLUDED */

4
src/definitions.h
View File

@@ -42,7 +42,7 @@
#define WIIMOTE_PI 3.14159265f #define WIIMOTE_PI 3.14159265f
//#define WITH_WIIUSE_DEBUG /* #define WITH_WIIUSE_DEBUG */
extern FILE* logtarget[]; extern FILE* logtarget[];
@@ -89,4 +89,4 @@ extern FILE* logtarget[];
/** @} */ /** @} */
#endif // DEFINITIONS_H_INCLUDED #endif /* DEFINITIONS_H_INCLUDED */

4
src/dynamics.c
View File

@@ -37,8 +37,8 @@
#include "dynamics.h" #include "dynamics.h"
#include <math.h> // for atan2f, atanf, sqrt #include <math.h> /* for atan2f, atanf, sqrt */
#include <stdlib.h> // for abs #include <stdlib.h> /* for abs */
/** /**

2
src/dynamics.h
View File

@@ -57,4 +57,4 @@ void apply_smoothing(struct accel_t* ac, struct orient_t* orient, int type);
} }
#endif #endif
#endif // DYNAMICS_H_INCLUDED #endif /* DYNAMICS_H_INCLUDED */

28
src/events.c
View File

@@ -37,24 +37,24 @@
#include "wiiuse_internal.h" #include "wiiuse_internal.h"
#include "events.h" #include "events.h"
#include "classic.h" // for classic_ctrl_disconnected, etc #include "classic.h" /* for classic_ctrl_disconnected, etc */
#include "dynamics.h" // for calculate_gforce, etc #include "dynamics.h" /* for calculate_gforce, etc */
#include "guitar_hero_3.h" // for guitar_hero_3_disconnected, etc #include "guitar_hero_3.h" /* for guitar_hero_3_disconnected, etc */
#include "ir.h" // for calculate_basic_ir, etc #include "ir.h" /* for calculate_basic_ir, etc */
#include "nunchuk.h" // for nunchuk_disconnected, etc #include "nunchuk.h" /* for nunchuk_disconnected, etc */
#include "wiiboard.h" // for wii_board_disconnected, etc #include "wiiboard.h" /* for wii_board_disconnected, etc */
#include "io.h" // for wiiuse_io_read on Windows, etc #include "io.h" /* for wiiuse_io_read on Windows, etc */
#ifndef WIIUSE_WIN32 #ifndef WIIUSE_WIN32
#include <sys/time.h> // for timeval #include <sys/time.h> /* for timeval */
#include <sys/select.h> // for select, fd_set #include <sys/select.h> /* for select, fd_set */
#include <unistd.h> // for read #include <unistd.h> /* for read */
#endif #endif
#include <errno.h> // for errno #include <errno.h> /* for errno */
#include <stdio.h> // for printf, perror #include <stdio.h> /* for printf, perror */
#include <stdlib.h> // for free, malloc #include <stdlib.h> /* for free, malloc */
#include <string.h> // for memcpy, memset #include <string.h> /* for memcpy, memset */
static void idle_cycle(struct wiimote_t* wm); static void idle_cycle(struct wiimote_t* wm);
static void clear_dirty_reads(struct wiimote_t* wm); static void clear_dirty_reads(struct wiimote_t* wm);

2
src/events.h
View File

@@ -56,4 +56,4 @@ void handshake_expansion(struct wiimote_t* wm, byte* data, uint16_t len);
void disable_expansion(struct wiimote_t* wm); void disable_expansion(struct wiimote_t* wm);
/** @} */ /** @} */
#endif // EVENTS_H_INCLUDED #endif /* EVENTS_H_INCLUDED */

8
src/guitar_hero_3.c
View File

@@ -33,11 +33,11 @@
#include "guitar_hero_3.h" #include "guitar_hero_3.h"
#include "dynamics.h" // for calc_joystick_state #include "dynamics.h" /* for calc_joystick_state */
#include "events.h" // for handshake_expansion #include "events.h" /* for handshake_expansion */
#include <stdlib.h> // for malloc #include <stdlib.h> /* for malloc */
#include <string.h> // for memset #include <string.h> /* for memset */
static void guitar_hero_3_pressed_buttons(struct guitar_hero_3_t* gh3, short now); static void guitar_hero_3_pressed_buttons(struct guitar_hero_3_t* gh3, short now);

2
src/guitar_hero_3.h
View File

@@ -63,4 +63,4 @@ void guitar_hero_3_event(struct guitar_hero_3_t* gh3, byte* msg);
} }
#endif #endif
#endif // GUITAR_HERO_3_H_INCLUDED #endif /* GUITAR_HERO_3_H_INCLUDED */

2
src/io.c
View File

@@ -32,7 +32,7 @@
*/ */
#include "io.h" #include "io.h"
#include <stdlib.h> // for free, malloc #include <stdlib.h> /* for free, malloc */
/** /**

2
src/io.h
View File

@@ -60,4 +60,4 @@ int wiiuse_io_write(struct wiimote_t* wm, byte* buf, int len);
} }
#endif #endif
#endif // CONNECT_H_INCLUDED #endif /* CONNECT_H_INCLUDED */

18
src/io_nix.c
View File

@@ -36,15 +36,15 @@
#ifdef WIIUSE_BLUEZ #ifdef WIIUSE_BLUEZ
#include <bluetooth/bluetooth.h> // for ba2str, str2ba #include <bluetooth/bluetooth.h> /* for ba2str, str2ba */
#include <bluetooth/hci.h> // for inquiry_info #include <bluetooth/hci.h> /* for inquiry_info */
#include <bluetooth/hci_lib.h> // for hci_get_route, hci_inquiry, etc #include <bluetooth/hci_lib.h> /* for hci_get_route, hci_inquiry, etc */
#include <bluetooth/l2cap.h> // for sockaddr_l2 #include <bluetooth/l2cap.h> /* for sockaddr_l2 */
#include <stdio.h> // for perror #include <stdio.h> /* for perror */
#include <string.h> // for memset #include <string.h> /* for memset */
#include <sys/socket.h> // for connect, socket #include <sys/socket.h> /* for connect, socket */
#include <unistd.h> // for close, write #include <unistd.h> /* for close, write */
#include <errno.h> #include <errno.h>
static int wiiuse_connect_single(struct wiimote_t* wm, char* address); static int wiiuse_connect_single(struct wiimote_t* wm, char* address);
@@ -76,7 +76,7 @@ int wiiuse_find(struct wiimote_t** wm, int max_wiimotes, int timeout) {
/* reset all wiimote bluetooth device addresses */ /* reset all wiimote bluetooth device addresses */
for (found_wiimotes = 0; found_wiimotes < max_wiimotes; ++found_wiimotes) { for (found_wiimotes = 0; found_wiimotes < max_wiimotes; ++found_wiimotes) {
//bacpy(&(wm[found_wiimotes]->bdaddr), BDADDR_ANY); /* bacpy(&(wm[found_wiimotes]->bdaddr), BDADDR_ANY); */
memset(&(wm[found_wiimotes]->bdaddr), 0, sizeof(bdaddr_t)); memset(&(wm[found_wiimotes]->bdaddr), 0, sizeof(bdaddr_t));
} }
found_wiimotes = 0; found_wiimotes = 0;

2
src/io_win.c
View File

@@ -63,7 +63,7 @@ int wiiuse_find(struct wiimote_t** wm, int max_wiimotes, int timeout) {
HIDD_ATTRIBUTES attr; HIDD_ATTRIBUTES attr;
int found = 0; int found = 0;
(void) timeout; // unused (void) timeout; /* unused */
device_data.cbSize = sizeof(device_data); device_data.cbSize = sizeof(device_data);
index = 0; index = 0;

6
src/ir.c
View File

@@ -33,7 +33,7 @@
#include "ir.h" #include "ir.h"
#include <math.h> // for atanf, cos, sin, sqrt #include <math.h> /* for atanf, cos, sin, sqrt */
static int get_ir_sens(struct wiimote_t* wm, const byte** block1, const byte** block2); static int get_ir_sens(struct wiimote_t* wm, const byte** block1, const byte** block2);
static void interpret_ir_data(struct wiimote_t* wm); static void interpret_ir_data(struct wiimote_t* wm);
@@ -82,7 +82,7 @@ void wiiuse_set_ir(struct wiimote_t* wm, int status) {
if(status) { if(status) {
WIIUSE_DEBUG("Tried to enable IR, will wait until handshake finishes."); WIIUSE_DEBUG("Tried to enable IR, will wait until handshake finishes.");
WIIMOTE_ENABLE_STATE(wm, WIIMOTE_STATE_IR); WIIMOTE_ENABLE_STATE(wm, WIIMOTE_STATE_IR);
} // else ignoring request to turn off, since it's turned off by default } /* else ignoring request to turn off, since it's turned off by default */
return; return;
} }
@@ -429,7 +429,7 @@ static void interpret_ir_data(struct wiimote_t* wm) {
wm->ir.ay = wm->ir.y; wm->ir.ay = wm->ir.y;
/* can't calculate yaw because we don't have the distance */ /* can't calculate yaw because we don't have the distance */
//wm->orient.yaw = calc_yaw(&wm->ir); /* wm->orient.yaw = calc_yaw(&wm->ir); */
ir_convert_to_vres(&wm->ir.x, &wm->ir.y, wm->ir.aspect, wm->ir.vres[0], wm->ir.vres[1]); ir_convert_to_vres(&wm->ir.x, &wm->ir.y, wm->ir.aspect, wm->ir.vres[0], wm->ir.vres[1]);
break; break;

2
src/ir.h
View File

@@ -56,6 +56,6 @@ float calc_yaw(struct ir_t* ir);
} }
#endif #endif
#endif // IR_H_INCLUDED #endif /* IR_H_INCLUDED */

8
src/nunchuk.c
View File

@@ -33,11 +33,11 @@
#include "nunchuk.h" #include "nunchuk.h"
#include "dynamics.h" // for calc_joystick_state, etc #include "dynamics.h" /* for calc_joystick_state, etc */
#include "events.h" // for handshake_expansion #include "events.h" /* for handshake_expansion */
#include <stdlib.h> // for malloc #include <stdlib.h> /* for malloc */
#include <string.h> // for memset #include <string.h> /* for memset */
static void nunchuk_pressed_buttons(struct nunchuk_t* nc, byte now); static void nunchuk_pressed_buttons(struct nunchuk_t* nc, byte now);

2
src/nunchuk.h
View File

@@ -54,4 +54,4 @@ void nunchuk_event(struct nunchuk_t* nc, byte* msg);
} }
#endif #endif
#endif // NUNCHUK_H_INCLUDED #endif /* NUNCHUK_H_INCLUDED */

2
src/os.h
View File

@@ -49,4 +49,4 @@
#pragma warning(disable:4217) #pragma warning(disable:4217)
#endif #endif
#endif // OS_H_INCLUDED #endif /* OS_H_INCLUDED */

2
src/util.c
View File

@@ -40,7 +40,7 @@ void wiiuse_millisleep(int durationMilliseconds) {
#else /* not win32 - assuming posix */ #else /* not win32 - assuming posix */
#include <unistd.h> // for usleep #include <unistd.h> /* for usleep */
void wiiuse_millisleep(int durationMilliseconds) { void wiiuse_millisleep(int durationMilliseconds) {
usleep(durationMilliseconds * 1000); usleep(durationMilliseconds * 1000);

4
src/wiiboard.c
View File

@@ -34,8 +34,8 @@
#include "wiiboard.h" #include "wiiboard.h"
#include <stdio.h> // for printf #include <stdio.h> /* for printf */
#include <string.h> // for memset #include <string.h> /* for memset */
/** /**
* @brief Handle the handshake data from the wiiboard. * @brief Handle the handshake data from the wiiboard.

8
src/wiiuse.c
View File

@@ -36,11 +36,11 @@
*/ */
#include "wiiuse_internal.h" #include "wiiuse_internal.h"
#include "io.h" // for wiiuse_handshake, etc #include "io.h" /* for wiiuse_handshake, etc */
#include <stdio.h> // for printf, FILE #include <stdio.h> /* for printf, FILE */
#include <stdlib.h> // for malloc, free #include <stdlib.h> /* for malloc, free */
#include <string.h> // for memcpy, memset #include <string.h> /* for memcpy, memset */
static int g_banner = 0; static int g_banner = 0;
static const char g_wiiuse_version_string[] = WIIUSE_VERSION; static const char g_wiiuse_version_string[] = WIIUSE_VERSION;

2
src/wiiuse.h
View File

@@ -104,7 +104,7 @@
#include <stdint.h> #include <stdint.h>
#endif #endif
#include <stdio.h> // for FILE #include <stdio.h> /* for FILE */
/** @defgroup publicapi External API */ /** @defgroup publicapi External API */
/** @{ */ /** @{ */

2
src/wiiuse_internal.h
View File

@@ -389,7 +389,7 @@ WIIUSE_DECLARE_BUFFERING_OPS(uint32_t)
#undef WIIUSE_DECLARE_BUFFERING_OPS #undef WIIUSE_DECLARE_BUFFERING_OPS
#endif // not in doxygen #endif /* not in doxygen */
#ifdef __cplusplus #ifdef __cplusplus
} }