xnu-2422.100.13.tar.gz

[apple/xnu.git] / iokit / IOKit / IOInterruptController.h

diff --git a/iokit/IOKit/IOInterruptController.h b/iokit/IOKit/IOInterruptController.h
index d9952359459c688b3130de7908f85cdd9a0c45b1..71f55e549117978a3a60fed54964b875d060cf8e 100644 (file)
--- a/iokit/IOKit/IOInterruptController.h
+++ b/iokit/IOKit/IOInterruptController.h
@@ -50,7 +50,7 @@ struct IOInterruptVector {
   volatile char               interruptRegistered;
   IOLock *                    interruptLock;
   IOService *                 nub;
   volatile char               interruptRegistered;
   IOLock *                    interruptLock;
   IOService *                 nub;

-  long                        source;
+  int                         source;

   void *                      target;
   IOInterruptHandler          handler;
   void *                      refCon;
   void *                      target;
   IOInterruptHandler          handler;
   void *                      refCon;


@@ -59,6 +59,11 @@ struct IOInterruptVector {
 
 typedef struct IOInterruptVector IOInterruptVector;
 
 
 typedef struct IOInterruptVector IOInterruptVector;
 

+#if __LP64__
+typedef int32_t IOInterruptVectorNumber;
+#else
+typedef long IOInterruptVectorNumber;
+#endif

 
 class IOInterruptController : public IOService
 {
 
 class IOInterruptController : public IOService
 {


@@ -91,12 +96,12 @@ public:
   
   // Methods to be overridden for simplifed interrupt controller subclasses.
   
   
   // Methods to be overridden for simplifed interrupt controller subclasses.
   

-  virtual bool vectorCanBeShared(long vectorNumber, IOInterruptVector *vector);
-  virtual void initVector(long vectorNumber, IOInterruptVector *vector);
-  virtual int  getVectorType(long vectorNumber, IOInterruptVector *vector);
-  virtual void disableVectorHard(long vectorNumber, IOInterruptVector *vector);
-  virtual void enableVector(long vectorNumber, IOInterruptVector *vector);
-  virtual void causeVector(long vectorNumber, IOInterruptVector *vector);
+  virtual bool vectorCanBeShared(IOInterruptVectorNumber vectorNumber, IOInterruptVector *vector);
+  virtual void initVector(IOInterruptVectorNumber vectorNumber, IOInterruptVector *vector);
+  virtual int  getVectorType(IOInterruptVectorNumber vectorNumber, IOInterruptVector *vector);
+  virtual void disableVectorHard(IOInterruptVectorNumber vectorNumber, IOInterruptVector *vector);
+  virtual void enableVector(IOInterruptVectorNumber vectorNumber, IOInterruptVector *vector);
+  virtual void causeVector(IOInterruptVectorNumber vectorNumber, IOInterruptVector *vector);

 
   OSMetaClassDeclareReservedUnused(IOInterruptController, 0);
   OSMetaClassDeclareReservedUnused(IOInterruptController, 1);
 
   OSMetaClassDeclareReservedUnused(IOInterruptController, 0);
   OSMetaClassDeclareReservedUnused(IOInterruptController, 1);


@@ -116,7 +121,7 @@ private:
   int               numVectors;
   int               vectorsRegistered;
   int               vectorsEnabled;
   int               numVectors;
   int               vectorsRegistered;
   int               vectorsEnabled;

-  volatile long     controllerDisabled;
+  volatile int      controllerDisabled;

   bool              sourceIsLevel;
 
   struct ExpansionData { };
   bool              sourceIsLevel;
 
   struct ExpansionData { };