From: <re...@us...> - 2007-09-21 05:46:02
|
Revision: 6542 http://openhpi.svn.sourceforge.net/openhpi/?rev=6542&view=rev Author: renierm Date: 2007-09-20 22:46:04 -0700 (Thu, 20 Sep 2007) Log Message: ----------- #1794862 add checks for resource failed flag Modified Paths: -------------- openhpi/trunk/src/safhpi.c Modified: openhpi/trunk/src/safhpi.c =================================================================== --- openhpi/trunk/src/safhpi.c 2007-09-21 05:31:23 UTC (rev 6541) +++ openhpi/trunk/src/safhpi.c 2007-09-21 05:46:04 UTC (rev 6542) @@ -2062,7 +2062,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); if(!(res->ResourceCapabilities & SAHPI_CAPABILITY_SENSOR)) { dbg("Resource %d doesn't have sensors in Domain %d", @@ -2117,7 +2117,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); if(!(res->ResourceCapabilities & SAHPI_CAPABILITY_SENSOR)) { dbg("Resource %d doesn't have sensors in Domain %d", @@ -2184,7 +2184,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); if(!(res->ResourceCapabilities & SAHPI_CAPABILITY_SENSOR)) { dbg("Resource %d doesn't have sensors in Domain %d", @@ -2240,7 +2240,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); if(!(res->ResourceCapabilities & SAHPI_CAPABILITY_SENSOR)) { dbg("Resource %d doesn't have sensors in Domain %d", @@ -2307,7 +2307,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); if(!(res->ResourceCapabilities & SAHPI_CAPABILITY_SENSOR)) { dbg("Resource %d doesn't have sensors in Domain %d", @@ -2372,7 +2372,7 @@ OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); if(!(res->ResourceCapabilities & SAHPI_CAPABILITY_SENSOR)) { dbg("Resource %d doesn't have sensors in Domain %d", @@ -2732,7 +2732,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); /* Interface and conformance checking */ if(!(res->ResourceCapabilities & SAHPI_CAPABILITY_INVENTORY_DATA)) { @@ -2793,7 +2793,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); /* Interface and conformance checking */ if(!(res->ResourceCapabilities & SAHPI_CAPABILITY_INVENTORY_DATA)) { @@ -2869,7 +2869,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, rpte); + OH_RESOURCE_GET_CHECK(d, ResourceId, rpte); /* Interface and conformance checking */ if(!(rpte->ResourceCapabilities & SAHPI_CAPABILITY_INVENTORY_DATA)) { @@ -2947,7 +2947,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); /* Interface and conformance checking */ if(!(res->ResourceCapabilities & SAHPI_CAPABILITY_INVENTORY_DATA)) { @@ -3012,7 +3012,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); /* Interface and conformance checking */ if(!(res->ResourceCapabilities & SAHPI_CAPABILITY_INVENTORY_DATA)) { @@ -3078,7 +3078,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); /* Interface and conformance checking */ if(!(res->ResourceCapabilities & SAHPI_CAPABILITY_INVENTORY_DATA)) { @@ -3163,7 +3163,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, rpte); + OH_RESOURCE_GET_CHECK(d, ResourceId, rpte); /* Interface and conformance checking */ if(!(rpte->ResourceCapabilities & SAHPI_CAPABILITY_INVENTORY_DATA)) { @@ -3250,7 +3250,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); /* Interface and conformance checking */ if(!(res->ResourceCapabilities & SAHPI_CAPABILITY_INVENTORY_DATA)) { @@ -3306,7 +3306,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); /* Interface and conformance checking */ if(!(res->ResourceCapabilities & SAHPI_CAPABILITY_INVENTORY_DATA)) { @@ -3511,7 +3511,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); if(!(res->ResourceCapabilities & SAHPI_CAPABILITY_ANNUNCIATOR)) { dbg("Resource %d in Domain %d doesn't have annunciators", @@ -3575,7 +3575,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); if(!(res->ResourceCapabilities & SAHPI_CAPABILITY_ANNUNCIATOR)) { dbg("Resource %d in Domain %d doesn't have annunciators", @@ -3637,7 +3637,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); if(!(res->ResourceCapabilities & SAHPI_CAPABILITY_ANNUNCIATOR)) { dbg("Resource %d in Domain %d doesn't have annunciators", @@ -3852,7 +3852,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); if(!(res->ResourceCapabilities & SAHPI_CAPABILITY_ANNUNCIATOR)) { dbg("Resource %d in Domain %d doesn't have annunciators", @@ -5055,7 +5055,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); if (!(res->ResourceCapabilities & SAHPI_CAPABILITY_MANAGED_HOTSWAP)) { oh_release_domain(d); /* Unlock domain */ @@ -5321,7 +5321,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); if (!(res->ResourceCapabilities & SAHPI_CAPABILITY_MANAGED_HOTSWAP)) { oh_release_domain(d); /* Unlock domain */ @@ -5366,7 +5366,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); if (!(res->ResourceCapabilities & SAHPI_CAPABILITY_MANAGED_HOTSWAP)) { oh_release_domain(d); /* Unlock domain */ @@ -5408,7 +5408,7 @@ OH_CHECK_INIT_STATE(SessionId); OH_GET_DID(SessionId, did); OH_GET_DOMAIN(did, d); /* Lock domain */ - OH_RESOURCE_GET(d, ResourceId, res); + OH_RESOURCE_GET_CHECK(d, ResourceId, res); if (!(res->ResourceCapabilities & SAHPI_CAPABILITY_MANAGED_HOTSWAP)) { oh_release_domain(d); /* Unlock domain */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |