Permalink
Browse files

Merge branch 'origin-svn' into marcan

Conflicts:

	wiiuse/wpad.c
  • Loading branch information...
2 parents da1bbf4 + 6f3ffaa commit 30f24c4771b637f09bc120c1f52c9f1ac82d1aaf @marcan marcan committed Dec 21, 2008
Showing with 4,656 additions and 4,348 deletions.
  1. +1 −1 Makefile
  2. +3 −1 gc/bte/bte.h
  3. +25 −1 gc/wiiuse/wiiuse.h
  4. +3 −0 gc/wiiuse/wpad.h
  5. +4,334 −4,326 gcsdk.vcproj
  6. +1 −1 libtinysmb/smb.c
  7. +16 −16 lwbt/bte.c
  8. +47 −0 wiiuse/dynamics.c
  9. +1 −0 wiiuse/dynamics.h
  10. +4 −0 wiiuse/events.c
  11. +8 −0 wiiuse/io.c
  12. +118 −0 wiiuse/wiiboard.c
  13. +53 −0 wiiuse/wiiboard.h
  14. +1 −0 wiiuse/wiiuse_internal.h
  15. +41 −2 wiiuse/wpad.c
View
@@ -170,7 +170,7 @@ BTEOBJ := bte.o hci.o l2cap.o btmemb.o btmemr.o btpbuf.o physbusif.o
#---------------------------------------------------------------------------------
WIIUSEOBJ := classic.o dynamics.o events.o guitar_hero_3.o io.o io_wii.o ir.o \
- nunchuk.o wiiuse.o wpad.o
+ nunchuk.o wiiboard.o wiiuse.o wpad.o
#---------------------------------------------------------------------------------
TINYSMBOBJ := des.o lmhash.o smb.o
View
@@ -99,7 +99,9 @@ struct bte_pcb
u8 err;
u32 state;
void *cbarg;
- struct ctrl_req_t *ctrl_req;
+
+ struct ctrl_req_t *ctrl_req_head;
+ struct ctrl_req_t *ctrl_req_tail;
lwpq_t cmdq;
View
@@ -95,6 +95,7 @@
#define EXP_NUNCHUK 1
#define EXP_CLASSIC 2
#define EXP_GUITAR_HERO_3 3
+#define EXP_WII_BOARD 4
/* IR correction types */
typedef enum ir_position_t {
@@ -480,6 +481,26 @@ typedef struct guitar_hero_3_t {
struct joystick_t js; /**< joystick calibration */
} guitar_hero_3_t;
+/**
+ * @struct wii_board_t
+ * @brief Wii Balance Board expansion device.
+ */
+typedef struct wii_board_t {
+ float tl; /* Interpolated */
+ float tr;
+ float bl;
+ float br; /* End interp */
+ short rtl; /* RAW */
+ short rtr;
+ short rbl;
+ short rbr; /* /RAW */
+ short ctl[3]; /* Calibration */
+ short ctr[3];
+ short cbl[3];
+ short cbr[3]; /* /Calibration */
+ float x;
+ float y;
+} wii_board_t;
/**
* @struct expansion_t
@@ -492,6 +513,7 @@ typedef struct expansion_t {
struct nunchuk_t nunchuk;
struct classic_ctrl_t classic;
struct guitar_hero_3_t gh3;
+ struct wii_board_t wb;
};
} expansion_t;
@@ -538,7 +560,9 @@ typedef enum WIIUSE_EVENT_TYPE {
WIIUSE_CLASSIC_CTRL_INSERTED,
WIIUSE_CLASSIC_CTRL_REMOVED,
WIIUSE_GUITAR_HERO_3_CTRL_INSERTED,
- WIIUSE_GUITAR_HERO_3_CTRL_REMOVED
+ WIIUSE_GUITAR_HERO_3_CTRL_REMOVED,
+ WIIUSE_WII_BOARD_INSERTED,
+ WIIUSE_WII_BOARD_REMOVED
} WIIUSE_EVENT_TYPE;
/**
View
@@ -12,6 +12,7 @@ enum {
WPAD_CHAN_1,
WPAD_CHAN_2,
WPAD_CHAN_3,
+ WPAD_BALANCE_BOARD,
WPAD_MAX_WIIMOTES,
};
@@ -61,6 +62,7 @@ enum {
WPAD_EXP_NUNCHUK,
WPAD_EXP_CLASSIC,
WPAD_EXP_GUITARHERO3,
+ WPAD_EXP_WIIBOARD,
WPAD_EXP_UNKNOWN = 255
};
@@ -98,6 +100,7 @@ enum {
#define WPAD_THRESH_DEFAULT_IR WPAD_THRESH_IGNORE
#define WPAD_THRESH_DEFAULT_ACCEL 20
#define WPAD_THRESH_DEFAULT_JOYSTICK 2
+#define WPAD_THRESH_DEFAULT_BALANCEBOARD 30
#ifdef __cplusplus
extern "C" {
Oops, something went wrong.

0 comments on commit 30f24c4

Please sign in to comment.