originalNub = vector->nub;
originalSource = vector->source;
- // Save the dis/enable state for the original consumer's interrupt.
- // Then disable the source
- wasDisabledSoft = vector->interruptDisabledSoft;
- disableInterrupt(originalNub, originalSource);
+ // Physically disable the interrupt, but mark it as being enables in the hardware.
+ // The interruptDisabledSoft now indicates the driver's request for enablement.
+ disableVectorHard(vectorNumber, vector);
+ vector->interruptDisabledHard = 0;
// Initialize the new shared interrupt controller.
error = vector->sharedController->initInterruptController(this,
// put the original consumor's interrupt back to normal and
// get rid of whats left of the shared controller.
if (error != kIOReturnSuccess) {
+ // Save the driver's interrupt enablement state.
+ wasDisabledSoft = vector->interruptDisabledSoft;
+
+ // Make the interrupt really hard disabled.
+ vector->interruptDisabledSoft = 1;
+ vector->interruptDisabledHard = 1;
+
+ // Enable the original consumer's interrupt if needed.
+ if (!wasDisabledSoft) originalNub->enableInterrupt(originalSource);
enableInterrupt(originalNub, originalSource);
+
vector->sharedController->release();
vector->sharedController = 0;
IOUnlock(vector->interruptLock);
vector->target = vector->sharedController;
vector->refCon = 0;
+ // Save the driver's interrupt enablement state.
+ wasDisabledSoft = vector->interruptDisabledSoft;
+
+ // Make the interrupt really hard disabled.
+ vector->interruptDisabledSoft = 1;
+ vector->interruptDisabledHard = 1;
+
// Enable the original consumer's interrupt if needed.
if (!wasDisabledSoft) originalNub->enableInterrupt(originalSource);
}
if (vector->interruptDisabledSoft) {
vector->interruptDisabledSoft = 0;
+#if __ppc__
+ sync();
+ isync();
+#endif
+ if (!getPlatform()->atInterruptLevel()) {
+ while (vector->interruptActive);
+#if __ppc__
+ isync();
+#endif
+ }
if (vector->interruptDisabledHard) {
vector->interruptDisabledHard = 0;
}
// Allocate the memory for the vectors
- numVectors = 8; // For now a constant number.
+ numVectors = 32; // For now a constant number.
vectors = (IOInterruptVector *)IOMalloc(numVectors * sizeof(IOInterruptVector));
if (vectors == NULL) {
IOFree(_interruptSources, sizeof(IOInterruptSource));
long vectorNumber;
IOInterruptVector *vector;
OSData *vectorData;
- IOInterruptState interruptState;;
+ IOInterruptState interruptState;
interruptSources = nub->_interruptSources;
vectorData = interruptSources[source].vectorData;
vectorNumber = *(long *)vectorData->getBytesNoCopy();
vector = &vectors[vectorNumber];
- if (vector->interruptDisabledSoft) {
- vector->interruptDisabledSoft = 0;
-
- interruptState = IOSimpleLockLockDisableInterrupt(controllerLock);
- vectorsEnabled++;
+ interruptState = IOSimpleLockLockDisableInterrupt(controllerLock);
+ if (!vector->interruptDisabledSoft) {
IOSimpleLockUnlockEnableInterrupt(controllerLock, interruptState);
-
- if (controllerDisabled && (vectorsEnabled == vectorsRegistered)) {
- controllerDisabled = 0;
- provider->enableInterrupt(0);
- }
+ return kIOReturnSuccess;
+ }
+
+ vector->interruptDisabledSoft = 0;
+ vectorsEnabled++;
+ IOSimpleLockUnlockEnableInterrupt(controllerLock, interruptState);
+
+ if (controllerDisabled && (vectorsEnabled == vectorsRegistered)) {
+ controllerDisabled = 0;
+ provider->enableInterrupt(0);
}
return kIOReturnSuccess;
long vectorNumber;
IOInterruptVector *vector;
OSData *vectorData;
- IOInterruptState interruptState;;
+ IOInterruptState interruptState;
interruptSources = nub->_interruptSources;
vectorData = interruptSources[source].vectorData;
vectorNumber = *(long *)vectorData->getBytesNoCopy();
vector = &vectors[vectorNumber];
+ interruptState = IOSimpleLockLockDisableInterrupt(controllerLock);
if (!vector->interruptDisabledSoft) {
vector->interruptDisabledSoft = 1;
#if __ppc__
sync();
isync();
#endif
-
- interruptState = IOSimpleLockLockDisableInterrupt(controllerLock);
vectorsEnabled--;
- IOSimpleLockUnlockEnableInterrupt(controllerLock, interruptState);
}
+ IOSimpleLockUnlockEnableInterrupt(controllerLock, interruptState);
if (!getPlatform()->atInterruptLevel()) {
while (vector->interruptActive);