dix: FreeDeviceClass() and friends can be static.
This commit is contained in:
parent
3c3a47d0f5
commit
971aef6441
|
@ -659,31 +659,10 @@ InitAndStartDevices()
|
||||||
return Success;
|
return Success;
|
||||||
}
|
}
|
||||||
|
|
||||||
_X_EXPORT void
|
|
||||||
FreeAllDeviceClasses(ClassesPtr classes)
|
|
||||||
{
|
|
||||||
if (!classes)
|
|
||||||
return;
|
|
||||||
|
|
||||||
FreeDeviceClass(KeyClass, (pointer)&classes->key);
|
|
||||||
FreeDeviceClass(ValuatorClass, (pointer)&classes->valuator);
|
|
||||||
FreeDeviceClass(ButtonClass, (pointer)&classes->button);
|
|
||||||
FreeDeviceClass(FocusClass, (pointer)&classes->focus);
|
|
||||||
FreeDeviceClass(ProximityClass, (pointer)&classes->proximity);
|
|
||||||
|
|
||||||
FreeFeedbackClass(KbdFeedbackClass, (pointer)&classes->kbdfeed);
|
|
||||||
FreeFeedbackClass(PtrFeedbackClass, (pointer)&classes->ptrfeed);
|
|
||||||
FreeFeedbackClass(IntegerFeedbackClass, (pointer)&classes->intfeed);
|
|
||||||
FreeFeedbackClass(StringFeedbackClass, (pointer)&classes->stringfeed);
|
|
||||||
FreeFeedbackClass(BellFeedbackClass, (pointer)&classes->bell);
|
|
||||||
FreeFeedbackClass(LedFeedbackClass, (pointer)&classes->leds);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Free the given device class and reset the pointer to NULL.
|
* Free the given device class and reset the pointer to NULL.
|
||||||
*/
|
*/
|
||||||
_X_EXPORT void
|
static void
|
||||||
FreeDeviceClass(int type, pointer *class)
|
FreeDeviceClass(int type, pointer *class)
|
||||||
{
|
{
|
||||||
if (!(*class))
|
if (!(*class))
|
||||||
|
@ -742,7 +721,8 @@ FreeDeviceClass(int type, pointer *class)
|
||||||
}
|
}
|
||||||
*class = NULL;
|
*class = NULL;
|
||||||
}
|
}
|
||||||
_X_EXPORT void
|
|
||||||
|
static void
|
||||||
FreeFeedbackClass(int type, pointer *class)
|
FreeFeedbackClass(int type, pointer *class)
|
||||||
{
|
{
|
||||||
if (!(*class))
|
if (!(*class))
|
||||||
|
@ -828,6 +808,28 @@ FreeFeedbackClass(int type, pointer *class)
|
||||||
}
|
}
|
||||||
*class = NULL;
|
*class = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
FreeAllDeviceClasses(ClassesPtr classes)
|
||||||
|
{
|
||||||
|
if (!classes)
|
||||||
|
return;
|
||||||
|
|
||||||
|
FreeDeviceClass(KeyClass, (pointer)&classes->key);
|
||||||
|
FreeDeviceClass(ValuatorClass, (pointer)&classes->valuator);
|
||||||
|
FreeDeviceClass(ButtonClass, (pointer)&classes->button);
|
||||||
|
FreeDeviceClass(FocusClass, (pointer)&classes->focus);
|
||||||
|
FreeDeviceClass(ProximityClass, (pointer)&classes->proximity);
|
||||||
|
|
||||||
|
FreeFeedbackClass(KbdFeedbackClass, (pointer)&classes->kbdfeed);
|
||||||
|
FreeFeedbackClass(PtrFeedbackClass, (pointer)&classes->ptrfeed);
|
||||||
|
FreeFeedbackClass(IntegerFeedbackClass, (pointer)&classes->intfeed);
|
||||||
|
FreeFeedbackClass(StringFeedbackClass, (pointer)&classes->stringfeed);
|
||||||
|
FreeFeedbackClass(BellFeedbackClass, (pointer)&classes->bell);
|
||||||
|
FreeFeedbackClass(LedFeedbackClass, (pointer)&classes->leds);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Close down a device and free all resources.
|
* Close down a device and free all resources.
|
||||||
* Once closed down, the driver will probably not expect you that you'll ever
|
* Once closed down, the driver will probably not expect you that you'll ever
|
||||||
|
|
|
@ -523,9 +523,6 @@ extern int AllocMasterDevice(ClientPtr client,
|
||||||
extern void DeepCopyDeviceClasses(DeviceIntPtr from,
|
extern void DeepCopyDeviceClasses(DeviceIntPtr from,
|
||||||
DeviceIntPtr to);
|
DeviceIntPtr to);
|
||||||
|
|
||||||
extern void FreeDeviceClass(int type, pointer* class);
|
|
||||||
extern void FreeFeedbackClass(int type, pointer* class);
|
|
||||||
extern void FreeAllDeviceClasses(ClassesPtr classes);
|
|
||||||
extern int EnterLeaveSemaphoresIsset(WindowPtr win);
|
extern int EnterLeaveSemaphoresIsset(WindowPtr win);
|
||||||
extern int FocusSemaphoresIsset(WindowPtr win);
|
extern int FocusSemaphoresIsset(WindowPtr win);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user