Commit 12871a5
committed
gcn: detect GameCube Dance Mat (SI_DANCEMAT, 0x09000300)
Unlike DK Bongos (which share the standard GC controller's SI device
ID), the dance mat has a unique SI sub-type: 0x09000300 -- matches
Dolphin's SI_DANCEMAT enum (SI_TYPE_GC | SI_GC_STANDARD | 0x00000300).
libogc2 doesn't ship a constant for it, so we just hard-code the
0x00000300 sub-type check.
snap_gc()'s style-resolution chain is now ordered:
1. (t & 0x0000FF00) == 0x00000300 -> DanceMat (unique SI type)
2. (t & SI_GC_WAVEBIRD) match -> WaveBird (wireless mix)
3. PAD_IsBarrel(chan) -> DK Bongo (USE_ORIGIN latch)
4. fallback -> GCN
DanceMat check comes first because its sub-type bits would otherwise
trip the GCN fallback (and incorrectly read "GCN" with all-zero
analog axes, since dance mats have no sticks/triggers). DK Bongo
check stays after WaveBird so we don't accidentally relabel a
wireless pad whose origin hasn't synced yet.
Rumble disabled for both bongos and dance mats (neither has a motor).1 parent ff93708 commit 12871a5
1 file changed
Lines changed: 31 additions & 16 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
151 | 151 | | |
152 | 152 | | |
153 | 153 | | |
| 154 | + | |
154 | 155 | | |
155 | 156 | | |
156 | 157 | | |
| |||
164 | 165 | | |
165 | 166 | | |
166 | 167 | | |
| 168 | + | |
167 | 169 | | |
168 | 170 | | |
169 | 171 | | |
| |||
350 | 352 | | |
351 | 353 | | |
352 | 354 | | |
353 | | - | |
354 | | - | |
355 | | - | |
356 | 355 | | |
357 | | - | |
358 | | - | |
359 | | - | |
360 | | - | |
361 | | - | |
362 | | - | |
363 | | - | |
364 | | - | |
365 | | - | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
366 | 377 | | |
| 378 | + | |
| 379 | + | |
367 | 380 | | |
368 | | - | |
369 | | - | |
370 | | - | |
371 | | - | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
372 | 387 | | |
373 | 388 | | |
374 | 389 | | |
| |||
0 commit comments