aciodrv: Add wavepass support to ICCA (#1) - [merged] #187

Closed
opened 2021-03-17 20:39:03 +03:00 by icex2 · 12 comments
icex2 commented 2021-03-17 20:39:03 +03:00 (Migrated from github.com)

In GitLab by @xyen on Mar 17, 2021, 18:39

Merges aciodrv-wavepass -> master

Summary

Adds wavepass support to aciodrv, eamiotest, and eamio-icca.

Description

Implements wavepass support, while keeping the existing interfaces and slotted reader support.

In order to support the existing interface (which doesn't expose when the game calls the felica poll), as well as support for games that don't natively support wavepass readers, the felica polling of the wavepass reader has been implemented as something that happens automatically every X successful polls. This mirrors how the real games do it.

Related Issue

#1

How Has This Been Tested?

Tested with:
aciotest / eamiotest:

  • DDR Slotted: Node 1: type 3, flag 0, version 1.1.0, product ICCA, build date: Oct 26 2005 13:55:03
  • DDR Slotted: Node 2: type 3, flag 0, version 1.1.0, product ICCA, build date: Oct 26 2005 13:55:03
    (tested with just 1, as well as a pair)

aciotest / eamiotest / IIDX10,12,27:

  • IIDX Wavepass: Node 1: type 3, flag 0, version 1.5.1, product ICCB, build date: Apr 12 2010 09:29:00
  • IIDX Wavepass: Node 2: type 3, flag 0, version 1.5.1, product ICCB, build date: Apr 12 2010 09:29:00
    (IIDX13 errors on card-in, probably issue with how eamio is being used as previously eamio-icca had no use on it)

aciotest / eamiotest / sdvx1-5:

  • SDVX Wavepass: Node 1: type 3, flag 0, version 1.5.1, product ICCB, build date: Apr 12 2010 09:29:00

aciotest:

  • Jubeat Wavepass: Node 1: type 3, flag 0, version 1.7.3, product ICCC, build date: Oct 05 2012 20:26:53
  • Museca Wavepass: Node 2: type 3, flag 0, version 1.7.4, product ICCC, build date: Feb 27 2013 16:44:51

Thanks to:

  • Cereth for providing me with a slotted and wavepass reader to develop with.
  • Cammy, Shiz, Grim for testing out the code on a variety of additional readers.
In GitLab by @xyen on Mar 17, 2021, 18:39 _Merges aciodrv-wavepass -> master_ ## Summary Adds wavepass support to aciodrv, eamiotest, and eamio-icca. ## Description Implements wavepass support, while keeping the existing interfaces and slotted reader support. In order to support the existing interface (which doesn't expose when the game calls the felica poll), as well as support for games that don't natively support wavepass readers, the felica polling of the wavepass reader has been implemented as something that happens automatically every X successful polls. This mirrors how the real games do it. ## Related Issue #1 ## How Has This Been Tested? Tested with: aciotest / eamiotest: - DDR Slotted: Node 1: type 3, flag 0, version 1.1.0, product ICCA, build date: Oct 26 2005 13:55:03 - DDR Slotted: Node 2: type 3, flag 0, version 1.1.0, product ICCA, build date: Oct 26 2005 13:55:03 (tested with just 1, as well as a pair) aciotest / eamiotest / IIDX10,12,27: - IIDX Wavepass: Node 1: type 3, flag 0, version 1.5.1, product ICCB, build date: Apr 12 2010 09:29:00 - IIDX Wavepass: Node 2: type 3, flag 0, version 1.5.1, product ICCB, build date: Apr 12 2010 09:29:00 (IIDX13 errors on card-in, probably issue with how eamio is being used as previously eamio-icca had no use on it) aciotest / eamiotest / sdvx1-5: - SDVX Wavepass: Node 1: type 3, flag 0, version 1.5.1, product ICCB, build date: Apr 12 2010 09:29:00 aciotest: - Jubeat Wavepass: Node 1: type 3, flag 0, version 1.7.3, product ICCC, build date: Oct 05 2012 20:26:53 - Museca Wavepass: Node 2: type 3, flag 0, version 1.7.4, product ICCC, build date: Feb 27 2013 16:44:51 Thanks to: - Cereth for providing me with a slotted and wavepass reader to develop with. - Cammy, Shiz, Grim for testing out the code on a variety of additional readers.
icex2 commented 2021-03-17 22:38:49 +03:00 (Migrated from github.com)

Nit magic number: Create a macro or const field for the value, e.g. #define LOOPS_UNTIL_ICCA_POLL

Nit magic number: Create a macro or const field for the value, e.g. `#define LOOPS_UNTIL_ICCA_POLL`
icex2 commented 2021-03-17 22:40:14 +03:00 (Migrated from github.com)

I think that line can be removed if you assign it just a few lines below based on the actual data.

I think that line can be removed if you assign it just a few lines below based on the actual data.
icex2 commented 2021-03-17 22:40:55 +03:00 (Migrated from github.com)

For debugging, I would add a log_debug outputting how the readers was detected, e.g. slotted vs. wavepass.

For debugging, I would add a `log_debug` outputting how the readers was detected, e.g. slotted vs. wavepass.
icex2 commented 2021-03-17 22:41:55 +03:00 (Migrated from github.com)

Nit: Same as above, move magic number to const field or macro.

Nit: Same as above, move magic number to const field or macro.
icex2 commented 2021-03-17 22:42:55 +03:00 (Migrated from github.com)

I really do like how this turned out. Great job. I will already give you my approval since the things I pointed out are not crucial. Feel free to merge this once my comments are addressed and if you do not disapprove otherwise.

I really do like how this turned out. Great job. I will already give you my approval since the things I pointed out are not crucial. Feel free to merge this once my comments are addressed and if you do not disapprove otherwise.
icex2 commented 2021-03-17 22:42:59 +03:00 (Migrated from github.com)

approved this merge request

approved this merge request
icex2 commented 2021-03-18 00:35:40 +03:00 (Migrated from github.com)

In GitLab by @xyen on Mar 17, 2021, 22:35

Commented on src/main/eamio-icca/eamio-icca.c line 137

ah, I missed this, it's leftover from when I was testing probably, good catch.

In GitLab by @xyen on Mar 17, 2021, 22:35 Commented on [src/main/eamio-icca/eamio-icca.c line 137](https://github.com/djhackersdev/bemanitools/compare/e712da57c688970032ceb0ef242f6b3a5da02b8d..640373297e4b7fa93b276c2d1534e081573aeab9#diff-53e2eb261a5378fe4793fbc0bd71499cR137) ah, I missed this, it's leftover from when I was testing probably, good catch.
icex2 commented 2021-03-18 00:38:13 +03:00 (Migrated from github.com)

In GitLab by @xyen on Mar 17, 2021, 22:38

resolved all threads

In GitLab by @xyen on Mar 17, 2021, 22:38 resolved all threads
icex2 commented 2021-03-18 00:42:32 +03:00 (Migrated from github.com)

In GitLab by @xyen on Mar 17, 2021, 22:42

Commented on src/main/aciotest/icca.c line 117

changed this line in version 2 of the diff

In GitLab by @xyen on Mar 17, 2021, 22:42 Commented on [src/main/aciotest/icca.c line 117](https://github.com/djhackersdev/bemanitools/compare/e712da57c688970032ceb0ef242f6b3a5da02b8d..640373297e4b7fa93b276c2d1534e081573aeab9#diff-b36e1f74724c9921cd6ecc2569d145d1R117) changed this line in [version 2 of the diff](/djhackers/bemanitools/-/merge_requests/86/diffs?diff_id=1547&start_sha=640373297e4b7fa93b276c2d1534e081573aeab9#44a37d7dc65d5a67bcdd229a58f9540e4bf1097e_117_120)
icex2 commented 2021-03-18 00:42:32 +03:00 (Migrated from github.com)

In GitLab by @xyen on Mar 17, 2021, 22:42

Commented on src/main/eamio-icca/eamio-icca.c line 137

changed this line in version 2 of the diff

In GitLab by @xyen on Mar 17, 2021, 22:42 Commented on [src/main/eamio-icca/eamio-icca.c line 137](https://github.com/djhackersdev/bemanitools/compare/e712da57c688970032ceb0ef242f6b3a5da02b8d..640373297e4b7fa93b276c2d1534e081573aeab9#diff-53e2eb261a5378fe4793fbc0bd71499cR137) changed this line in [version 2 of the diff](/djhackers/bemanitools/-/merge_requests/86/diffs?diff_id=1547&start_sha=640373297e4b7fa93b276c2d1534e081573aeab9#866648f1348d45f4d7bf0e106345e35a7a5ae089_137_137)
icex2 commented 2021-03-18 00:42:32 +03:00 (Migrated from github.com)

In GitLab by @xyen on Mar 17, 2021, 22:42

Commented on src/main/eamio-icca/eamio-icca.c line 282

changed this line in version 2 of the diff

In GitLab by @xyen on Mar 17, 2021, 22:42 Commented on [src/main/eamio-icca/eamio-icca.c line 282](https://github.com/djhackersdev/bemanitools/compare/e712da57c688970032ceb0ef242f6b3a5da02b8d..640373297e4b7fa93b276c2d1534e081573aeab9#diff-53e2eb261a5378fe4793fbc0bd71499cR282) changed this line in [version 2 of the diff](/djhackers/bemanitools/-/merge_requests/86/diffs?diff_id=1547&start_sha=640373297e4b7fa93b276c2d1534e081573aeab9#866648f1348d45f4d7bf0e106345e35a7a5ae089_282_281)
icex2 commented 2021-03-18 00:42:33 +03:00 (Migrated from github.com)

In GitLab by @xyen on Mar 17, 2021, 22:42

added 1 commit

  • 83c1f4f0 - aciodrv: address some magic numbers with felica polling

Compare with previous version

In GitLab by @xyen on Mar 17, 2021, 22:42 added 1 commit <ul><li>83c1f4f0 - aciodrv: address some magic numbers with felica polling</li></ul> [Compare with previous version](/djhackers/bemanitools/-/merge_requests/86/diffs?diff_id=1547&start_sha=640373297e4b7fa93b276c2d1534e081573aeab9)
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Max/djhackersdev_bemanitools#187