Loading...
--- xnu/xnu-1456.1.26/iokit/Kernel/IOInterruptController.cpp
+++ xnu/xnu-1228.15.4/iokit/Kernel/IOInterruptController.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998-2008 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1998-2000 Apple Computer, Inc. All rights reserved.
*
* @APPLE_OSREFERENCE_LICENSE_HEADER_START@
*
@@ -44,6 +44,7 @@
#include <IOKit/IOInterrupts.h>
#include <IOKit/IOInterruptController.h>
+
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#define super IOService
@@ -65,21 +66,19 @@
void *refCon)
{
IOInterruptSource *interruptSources;
- IOInterruptVectorNumber vectorNumber;
- IOInterruptVector *vector;
- int wasDisabledSoft;
+ long vectorNumber;
+ IOInterruptVector *vector;
+ long wasDisabledSoft;
IOReturn error;
OSData *vectorData;
+ IOService *originalNub;
+ int originalSource;
IOOptionBits options;
bool canBeShared, shouldBeShared, wasAlreadyRegisterd;
-
- IOService *originalNub = NULL; // Protected by wasAlreadyRegisterd
- int originalSource = 0; // Protected by wasAlreadyRegisterd
-
-
- interruptSources = nub->_interruptSources;
- vectorData = interruptSources[source].vectorData;
- vectorNumber = *(IOInterruptVectorNumber *)vectorData->getBytesNoCopy();
+
+ interruptSources = nub->_interruptSources;
+ vectorData = interruptSources[source].vectorData;
+ vectorNumber = *(long *)vectorData->getBytesNoCopy();
vector = &vectors[vectorNumber];
// Get the lock for this vector.
@@ -193,7 +192,6 @@
vector->interruptRegistered = 1;
// Enable the original consumer's interrupt if needed.
- // originalNub is protected by wasAlreadyRegisterd here (see line 184).
if (!wasDisabledSoft) originalNub->enableInterrupt(originalSource);
}
@@ -225,13 +223,13 @@
IOReturn IOInterruptController::unregisterInterrupt(IOService *nub, int source)
{
IOInterruptSource *interruptSources;
- IOInterruptVectorNumber vectorNumber;
- IOInterruptVector *vector;
- OSData *vectorData;
-
- interruptSources = nub->_interruptSources;
- vectorData = interruptSources[source].vectorData;
- vectorNumber = *(IOInterruptVectorNumber *)vectorData->getBytesNoCopy();
+ long vectorNumber;
+ IOInterruptVector *vector;
+ OSData *vectorData;
+
+ interruptSources = nub->_interruptSources;
+ vectorData = interruptSources[source].vectorData;
+ vectorNumber = *(long *)vectorData->getBytesNoCopy();
vector = &vectors[vectorNumber];
// Get the lock for this vector.
@@ -268,7 +266,7 @@
int *interruptType)
{
IOInterruptSource *interruptSources;
- IOInterruptVectorNumber vectorNumber;
+ long vectorNumber;
IOInterruptVector *vector;
OSData *vectorData;
@@ -276,7 +274,7 @@
interruptSources = nub->_interruptSources;
vectorData = interruptSources[source].vectorData;
- vectorNumber = *(IOInterruptVectorNumber *)vectorData->getBytesNoCopy();
+ vectorNumber = *(long *)vectorData->getBytesNoCopy();
vector = &vectors[vectorNumber];
*interruptType = getVectorType(vectorNumber, vector);
@@ -287,13 +285,13 @@
IOReturn IOInterruptController::enableInterrupt(IOService *nub, int source)
{
IOInterruptSource *interruptSources;
- IOInterruptVectorNumber vectorNumber;
- IOInterruptVector *vector;
- OSData *vectorData;
-
- interruptSources = nub->_interruptSources;
- vectorData = interruptSources[source].vectorData;
- vectorNumber = *(IOInterruptVectorNumber *)vectorData->getBytesNoCopy();
+ long vectorNumber;
+ IOInterruptVector *vector;
+ OSData *vectorData;
+
+ interruptSources = nub->_interruptSources;
+ vectorData = interruptSources[source].vectorData;
+ vectorNumber = *(long *)vectorData->getBytesNoCopy();
vector = &vectors[vectorNumber];
if (vector->interruptDisabledSoft) {
@@ -304,8 +302,7 @@
#endif
if (!getPlatform()->atInterruptLevel()) {
- while (vector->interruptActive)
- {}
+ while (vector->interruptActive);
#if __ppc__
isync();
#endif
@@ -323,13 +320,13 @@
IOReturn IOInterruptController::disableInterrupt(IOService *nub, int source)
{
IOInterruptSource *interruptSources;
- IOInterruptVectorNumber vectorNumber;
- IOInterruptVector *vector;
- OSData *vectorData;
-
- interruptSources = nub->_interruptSources;
- vectorData = interruptSources[source].vectorData;
- vectorNumber = *(IOInterruptVectorNumber *)vectorData->getBytesNoCopy();
+ long vectorNumber;
+ IOInterruptVector *vector;
+ OSData *vectorData;
+
+ interruptSources = nub->_interruptSources;
+ vectorData = interruptSources[source].vectorData;
+ vectorNumber = *(long *)vectorData->getBytesNoCopy();
vector = &vectors[vectorNumber];
vector->interruptDisabledSoft = 1;
@@ -339,8 +336,7 @@
#endif
if (!getPlatform()->atInterruptLevel()) {
- while (vector->interruptActive)
- {}
+ while (vector->interruptActive);
#if __ppc__
isync();
#endif
@@ -352,13 +348,13 @@
IOReturn IOInterruptController::causeInterrupt(IOService *nub, int source)
{
IOInterruptSource *interruptSources;
- IOInterruptVectorNumber vectorNumber;
- IOInterruptVector *vector;
- OSData *vectorData;
-
- interruptSources = nub->_interruptSources;
- vectorData = interruptSources[source].vectorData;
- vectorNumber = *(IOInterruptVectorNumber *)vectorData->getBytesNoCopy();
+ long vectorNumber;
+ IOInterruptVector *vector;
+ OSData *vectorData;
+
+ interruptSources = nub->_interruptSources;
+ vectorData = interruptSources[source].vectorData;
+ vectorNumber = *(long *)vectorData->getBytesNoCopy();
vector = &vectors[vectorNumber];
causeVector(vectorNumber, vector);
@@ -380,34 +376,34 @@
// Methods to be overridden for simplifed interrupt controller subclasses.
-bool IOInterruptController::vectorCanBeShared(IOInterruptVectorNumber /*vectorNumber*/,
+bool IOInterruptController::vectorCanBeShared(long /*vectorNumber*/,
IOInterruptVector */*vector*/)
{
return false;
}
-void IOInterruptController::initVector(IOInterruptVectorNumber /*vectorNumber*/,
+void IOInterruptController::initVector(long /*vectorNumber*/,
IOInterruptVector */*vector*/)
{
}
-int IOInterruptController::getVectorType(IOInterruptVectorNumber /*vectorNumber*/,
+int IOInterruptController::getVectorType(long /*vectorNumber*/,
IOInterruptVector */*vector*/)
{
return kIOInterruptTypeEdge;
}
-void IOInterruptController::disableVectorHard(IOInterruptVectorNumber /*vectorNumber*/,
+void IOInterruptController::disableVectorHard(long /*vectorNumber*/,
IOInterruptVector */*vector*/)
{
}
-void IOInterruptController::enableVector(IOInterruptVectorNumber /*vectorNumber*/,
+void IOInterruptController::enableVector(long /*vectorNumber*/,
IOInterruptVector */*vector*/)
{
}
-void IOInterruptController::causeVector(IOInterruptVectorNumber /*vectorNumber*/,
+void IOInterruptController::causeVector(long /*vectorNumber*/,
IOInterruptVector */*vector*/)
{
}
@@ -498,7 +494,7 @@
void *refCon)
{
IOInterruptSource *interruptSources;
- IOInterruptVectorNumber vectorNumber;
+ long vectorNumber;
IOInterruptVector *vector = 0;
OSData *vectorData;
IOInterruptState interruptState;
@@ -562,51 +558,52 @@
IOReturn IOSharedInterruptController::unregisterInterrupt(IOService *nub,
int source)
{
- IOInterruptVectorNumber vectorNumber;
- IOInterruptVector *vector;
+ IOInterruptSource *interruptSources;
+ long vectorNumber;
+ IOInterruptVector *vector;
+ OSData *vectorData;
IOInterruptState interruptState;
-
- for (vectorNumber = 0; vectorNumber < kIOSharedInterruptControllerDefaultVectors; vectorNumber++) {
- vector = &vectors[vectorNumber];
-
- // Get the lock for this vector.
- IOTakeLock(vector->interruptLock);
-
- // Return success if it is not already registered
- if (!vector->interruptRegistered
- || (vector->nub != nub) || (vector->source != source)) {
- IOUnlock(vector->interruptLock);
- continue;
- }
-
- // Soft disable the source and the controller too.
- disableInterrupt(nub, source);
-
- // Clear all the storage for the vector except for interruptLock.
- vector->interruptActive = 0;
- vector->interruptDisabledSoft = 0;
- vector->interruptDisabledHard = 0;
- vector->interruptRegistered = 0;
- vector->nub = 0;
- vector->source = 0;
- vector->handler = 0;
- vector->target = 0;
- vector->refCon = 0;
-
- interruptState = IOSimpleLockLockDisableInterrupt(controllerLock);
- vectorsRegistered--;
- IOSimpleLockUnlockEnableInterrupt(controllerLock, interruptState);
-
- // Move along to the next one.
+
+ interruptSources = nub->_interruptSources;
+ vectorData = interruptSources[source].vectorData;
+ vectorNumber = *(long *)vectorData->getBytesNoCopy();
+ vector = &vectors[vectorNumber];
+
+ // Get the lock for this vector.
+ IOTakeLock(vector->interruptLock);
+
+ // Return success if it is not already registered
+ if (!vector->interruptRegistered) {
IOUnlock(vector->interruptLock);
- }
-
+ return kIOReturnSuccess;
+ }
+
+ // Soft disable the source and the controller too.
+ disableInterrupt(nub, source);
+
+ // Clear all the storage for the vector except for interruptLock.
+ vector->interruptActive = 0;
+ vector->interruptDisabledSoft = 0;
+ vector->interruptDisabledHard = 0;
+ vector->interruptRegistered = 0;
+ vector->nub = 0;
+ vector->source = 0;
+ vector->handler = 0;
+ vector->target = 0;
+ vector->refCon = 0;
+
+ interruptState = IOSimpleLockLockDisableInterrupt(controllerLock);
+ vectorsRegistered--;
+ IOSimpleLockUnlockEnableInterrupt(controllerLock, interruptState);
+
+ IOUnlock(vector->interruptLock);
+
// Re-enable the controller if all vectors are enabled.
if (vectorsEnabled == vectorsRegistered) {
controllerDisabled = 0;
provider->enableInterrupt(0);
}
-
+
return kIOReturnSuccess;
}
@@ -621,14 +618,14 @@
int source)
{
IOInterruptSource *interruptSources;
- IOInterruptVectorNumber vectorNumber;
+ long vectorNumber;
IOInterruptVector *vector;
OSData *vectorData;
IOInterruptState interruptState;
interruptSources = nub->_interruptSources;
vectorData = interruptSources[source].vectorData;
- vectorNumber = *(IOInterruptVectorNumber *)vectorData->getBytesNoCopy();
+ vectorNumber = *(long *)vectorData->getBytesNoCopy();
vector = &vectors[vectorNumber];
interruptState = IOSimpleLockLockDisableInterrupt(controllerLock);
@@ -653,14 +650,14 @@
int source)
{
IOInterruptSource *interruptSources;
- IOInterruptVectorNumber vectorNumber;
+ long vectorNumber;
IOInterruptVector *vector;
OSData *vectorData;
IOInterruptState interruptState;
interruptSources = nub->_interruptSources;
vectorData = interruptSources[source].vectorData;
- vectorNumber = *(IOInterruptVectorNumber *)vectorData->getBytesNoCopy();
+ vectorNumber = *(long *)vectorData->getBytesNoCopy();
vector = &vectors[vectorNumber];
interruptState = IOSimpleLockLockDisableInterrupt(controllerLock);
@@ -675,8 +672,7 @@
IOSimpleLockUnlockEnableInterrupt(controllerLock, interruptState);
if (!getPlatform()->atInterruptLevel()) {
- while (vector->interruptActive)
- {}
+ while (vector->interruptActive);
#if __ppc__
isync();
#endif
@@ -695,7 +691,7 @@
IOService * nub,
int /*source*/)
{
- IOInterruptVectorNumber vectorNumber;
+ long vectorNumber;
IOInterruptVector *vector;
for (vectorNumber = 0; vectorNumber < numVectors; vectorNumber++) {