Skip to content

Read bus-reset generation from SelfIDCount, not reserved 0x06C #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrmidi merged 1 commit into from
Oct 23, 2026
Merged

Read bus-reset generation from SelfIDCount, not reserved 0x06C #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ASFWDriver/Controller/ControllerCoreInterrupts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,11 @@ IsochContextEvents ControllerCore::HandleInterrupt(const InterruptSnapshot& snap
if ((events & IntEventBits::kBusReset) != 0U) {
auto access = hw.TryBeginAccess();
if (!access) return {};
const uint32_t generation = access.Read(Register32::kSelfIDGeneration);
// SelfIDCount.selfIDGeneration already holds the new generation at the
// busReset edge (OHCI 1.2 Table 11-2); 0x06C is reserved.
const uint32_t generation =
(access.Read(Register32::kSelfIDCount) & SelfIDCountBits::kGenerationMask) >>
SelfIDCountBits::kGenerationShift;
// A reset edge is a hard liveness boundary: no higher layer may retain
// the old (generation,node) address while Self-ID and ROM discovery are
// in flight. This matches the legacy IOFireWireFamily policy of
Expand Down
1 change: 0 additions & 1 deletion ASFWDriver/Hardware/RegisterMap.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ enum class Register32 : uint32_t {
kHCControl = 0x050, // Read view: both 0x050/0x054 return latched value
kSelfIDBuffer = 0x064,
kSelfIDCount = 0x068,
kSelfIDGeneration = 0x06C,
kIRMultiChanMaskHiSet = 0x070,
kIRMultiChanMaskHiClear = 0x074,
kIRMultiChanMaskLoSet = 0x078,
Expand Down