i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

driver now enforces correct order of use of INIT_ACCELERANT and CLONE_ACCELERANT: bailing out with B_NOT_ALLOWED if incorrect use is detected.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16025 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rudolf Cornelissen
2006-01-21 17:04:49 +00:00
parent 7d59f2ebb1
commit 3eb82f0251
1 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/matrox/InitAccelerant.c
+24 -3
View File
@@ -4,7 +4,7 @@
Other authors: Other authors:
Mark Watson, Mark Watson,
Rudolf Cornelissen 10/2002-11/2005. Rudolf Cornelissen 10/2002-1/2006.
*/ */
#define MODULE_BIT 0x00800000 #define MODULE_BIT 0x00800000
@@ -16,7 +16,8 @@
static status_t init_common(int the_fd); static status_t init_common(int the_fd);
/* Initialization code shared between primary and cloned accelerants */ /* Initialization code shared between primary and cloned accelerants */
static status_t init_common(int the_fd) { static status_t init_common(int the_fd)
{
status_t result; status_t result;
gx00_get_private_data gpd; gx00_get_private_data gpd;
@@ -92,7 +93,8 @@ We need to determine if the kernel driver and the accelerant are compatible.
If they are, get the accelerant ready to handle other hook functions and If they are, get the accelerant ready to handle other hook functions and
report success or failure. report success or failure.
*/ */
status_t INIT_ACCELERANT(int the_fd) { status_t INIT_ACCELERANT(int the_fd)
{
status_t result; status_t result;
int pointer_reservation; //mem reserved for pointer int pointer_reservation; //mem reserved for pointer
int cnt; //used for iteration through the overlay buffers int cnt; //used for iteration through the overlay buffers
@@ -114,6 +116,13 @@ status_t INIT_ACCELERANT(int the_fd) {
if (result != B_OK) goto error0; if (result != B_OK) goto error0;
// LOG now available: !NULL si // LOG now available: !NULL si
/* ensure that INIT_ACCELERANT is executed just once (copies should be clones) */
if (si->accelerant_in_use)
{
result = B_NOT_ALLOWED;
goto error1;
}
/* assume G450/G550 signals are connected straight through (before powerup) */ /* assume G450/G550 signals are connected straight through (before powerup) */
si->crossed_conns = false; si->crossed_conns = false;
@@ -192,6 +201,8 @@ status_t INIT_ACCELERANT(int the_fd) {
/* a winner! */ /* a winner! */
result = B_OK; result = B_OK;
/* ensure that INIT_ACCELERANT won't be executed again (copies should be clones) */
si->accelerant_in_use = true;
goto error0; goto error0;
error1: error1:
@@ -272,6 +283,13 @@ status_t CLONE_ACCELERANT(void *data) {
/* bail out if the common initialization failed */ /* bail out if the common initialization failed */
if (result != B_OK) goto error1; if (result != B_OK) goto error1;
/* ensure that INIT_ACCELERANT is executed first (i.e. primary accelerant exists) */
if (!(si->accelerant_in_use))
{
result = B_NOT_ALLOWED;
goto error2;
}
/* get shared area for display modes */ /* get shared area for display modes */
result = my_mode_list_area = clone_area( result = my_mode_list_area = clone_area(
DRIVER_PREFIX " cloned display_modes", DRIVER_PREFIX " cloned display_modes",
@@ -311,6 +329,9 @@ void UNINIT_ACCELERANT(void)
/* delete benaphores ONLY if we are the primary accelerant */ /* delete benaphores ONLY if we are the primary accelerant */
DELETE_BEN(si->engine.lock); DELETE_BEN(si->engine.lock);
DELETE_BEN(si->overlay.lock); DELETE_BEN(si->overlay.lock);
/* ensure that INIT_ACCELERANT can be executed again */
si->accelerant_in_use = false;
} }
/* free our mode list area */ /* free our mode list area */