Merge remote-tracking branch 'upstream/master' into new_state_machine

This commit is contained in:
Julian Oes
2013-02-25 09:26:16 -08:00
10 changed files with 144 additions and 96 deletions
+1
View File
@@ -231,6 +231,7 @@ dsm_guess_format(bool reset)
0x3f, /* 6 channels (DX6) */
0x7f, /* 7 channels (DX7) */
0xff, /* 8 channels (DX8) */
0x1ff, /* 9 channels (DX9, etc.) */
0x3ff, /* 10 channels (DX10) */
0x3fff /* 18 channels (DX10) */
};