diff options
Diffstat (limited to 'sgx/services4/include')
-rw-r--r-- | sgx/services4/include/env/linux/pvr_drm_shared.h | 1 | ||||
-rw-r--r-- | sgx/services4/include/kernelbuffer.h | 1 | ||||
-rw-r--r-- | sgx/services4/include/kerneldisplay.h | 1 | ||||
-rw-r--r-- | sgx/services4/include/pdump.h | 1 | ||||
-rw-r--r-- | sgx/services4/include/pvr_bridge.h | 3 | ||||
-rw-r--r-- | sgx/services4/include/pvr_bridge_km.h | 1 | ||||
-rw-r--r-- | sgx/services4/include/pvrmmap.h | 1 | ||||
-rw-r--r-- | sgx/services4/include/pvrsrv_errors.h | 1 | ||||
-rw-r--r-- | sgx/services4/include/servicesint.h | 1 | ||||
-rw-r--r-- | sgx/services4/include/sgx_bridge.h | 1 | ||||
-rw-r--r-- | sgx/services4/include/sgx_mkif_km.h | 1 | ||||
-rw-r--r-- | sgx/services4/include/sgx_ukernel_status_codes.h | 11 | ||||
-rw-r--r-- | sgx/services4/include/sgxinfo.h | 3 |
13 files changed, 12 insertions, 15 deletions
diff --git a/sgx/services4/include/env/linux/pvr_drm_shared.h b/sgx/services4/include/env/linux/pvr_drm_shared.h index 770dc54..98d6a58 100644 --- a/sgx/services4/include/env/linux/pvr_drm_shared.h +++ b/sgx/services4/include/env/linux/pvr_drm_shared.h @@ -37,7 +37,6 @@ PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ /**************************************************************************/ #if !defined(__PVR_DRM_SHARED_H__) #define __PVR_DRM_SHARED_H__ diff --git a/sgx/services4/include/kernelbuffer.h b/sgx/services4/include/kernelbuffer.h index 8de5a98..6d8aed5 100644 --- a/sgx/services4/include/kernelbuffer.h +++ b/sgx/services4/include/kernelbuffer.h @@ -39,7 +39,6 @@ PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ /**************************************************************************/ #if !defined (__KERNELBUFFER_H__) diff --git a/sgx/services4/include/kerneldisplay.h b/sgx/services4/include/kerneldisplay.h index acb719a..dbaf126 100644 --- a/sgx/services4/include/kerneldisplay.h +++ b/sgx/services4/include/kerneldisplay.h @@ -39,7 +39,6 @@ PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ /**************************************************************************/ #if !defined (__KERNELDISPLAY_H__) diff --git a/sgx/services4/include/pdump.h b/sgx/services4/include/pdump.h index b6625a2..566a118 100644 --- a/sgx/services4/include/pdump.h +++ b/sgx/services4/include/pdump.h @@ -37,7 +37,6 @@ PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ /**************************************************************************/ #ifndef _SERVICES_PDUMP_H_ #define _SERVICES_PDUMP_H_ diff --git a/sgx/services4/include/pvr_bridge.h b/sgx/services4/include/pvr_bridge.h index 1d2a0b2..bf7e3ac 100644 --- a/sgx/services4/include/pvr_bridge.h +++ b/sgx/services4/include/pvr_bridge.h @@ -38,7 +38,6 @@ PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ /**************************************************************************/ #ifndef __PVR_BRIDGE_H__ @@ -67,7 +66,7 @@ extern "C" { #else /* __linux__ */ - #if defined(__QNXNTO__) + #if defined(__QNXNTO__) #define PVRSRV_IOC_GID (0x0UL) #else #error Unknown platform: Cannot define ioctls diff --git a/sgx/services4/include/pvr_bridge_km.h b/sgx/services4/include/pvr_bridge_km.h index 4bed88f..eb3f38b 100644 --- a/sgx/services4/include/pvr_bridge_km.h +++ b/sgx/services4/include/pvr_bridge_km.h @@ -38,7 +38,6 @@ PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ /**************************************************************************/ #ifndef __PVR_BRIDGE_KM_H_ diff --git a/sgx/services4/include/pvrmmap.h b/sgx/services4/include/pvrmmap.h index 50faa26..1a3930c 100644 --- a/sgx/services4/include/pvrmmap.h +++ b/sgx/services4/include/pvrmmap.h @@ -37,7 +37,6 @@ PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ /**************************************************************************/ #ifndef __PVRMMAP_H__ #define __PVRMMAP_H__ diff --git a/sgx/services4/include/pvrsrv_errors.h b/sgx/services4/include/pvrsrv_errors.h index 57d47cc..2e95810 100644 --- a/sgx/services4/include/pvrsrv_errors.h +++ b/sgx/services4/include/pvrsrv_errors.h @@ -38,7 +38,6 @@ PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ /**************************************************************************/ #if !defined (__PVRSRV_ERRORS_H__) diff --git a/sgx/services4/include/servicesint.h b/sgx/services4/include/servicesint.h index 956d106..32e19f9 100644 --- a/sgx/services4/include/servicesint.h +++ b/sgx/services4/include/servicesint.h @@ -38,7 +38,6 @@ PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ /**************************************************************************/ #if !defined (__SERVICESINT_H__) diff --git a/sgx/services4/include/sgx_bridge.h b/sgx/services4/include/sgx_bridge.h index 7f35fc1..33b27e3 100644 --- a/sgx/services4/include/sgx_bridge.h +++ b/sgx/services4/include/sgx_bridge.h @@ -38,7 +38,6 @@ PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ /**************************************************************************/ #if !defined(__SGX_BRIDGE_H__) diff --git a/sgx/services4/include/sgx_mkif_km.h b/sgx/services4/include/sgx_mkif_km.h index 7e15a10..3a9866f 100644 --- a/sgx/services4/include/sgx_mkif_km.h +++ b/sgx/services4/include/sgx_mkif_km.h @@ -38,7 +38,6 @@ PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ /**************************************************************************/ #if !defined (__SGX_MKIF_KM_H__) diff --git a/sgx/services4/include/sgx_ukernel_status_codes.h b/sgx/services4/include/sgx_ukernel_status_codes.h index 5045d27..dc8f2f3 100644 --- a/sgx/services4/include/sgx_ukernel_status_codes.h +++ b/sgx/services4/include/sgx_ukernel_status_codes.h @@ -39,7 +39,6 @@ PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ /**************************************************************************/ #ifndef __SGX_UKERNEL_STATUS_CODES_H__ @@ -151,6 +150,10 @@ MKTC_ST(MKTC_CRRL_READOPS2BLOCKED) MKTC_ST(MKTC_CRRL_SRC_WRITEOPSBLOCKED) #define MKTC_CRRL_SRC_READOPSBLOCKED 0xAD000310 MKTC_ST(MKTC_CRRL_SRC_READOPSBLOCKED) +#define MKTC_CRRL_TQ_WRITEOPSBLOCKED 0xAD000311 +MKTC_ST(MKTC_CRRL_TQ_WRITEOPSBLOCKED) +#define MKTC_CRRL_TQ_READOPSBLOCKED 0xAD000312 +MKTC_ST(MKTC_CRRL_TQ_READOPSBLOCKED) #define MKTC_KICKRENDER_START 0xAD000400 MKTC_ST(MKTC_KICKRENDER_START) @@ -330,6 +333,8 @@ MKTC_ST(MKTC_HWR_TRL_DP) MKTC_ST(MKTC_HWR_ISC) #define MKTC_HWR_2DL 0xAD000B0A MKTC_ST(MKTC_HWR_2DL) +#define MKTC_HWR_CLEANUP 0xAD000B0B +MKTC_ST(MKTC_HWR_CLEANUP) #define MKTC_URSV_START 0xAD000C00 MKTC_ST(MKTC_URSV_START) @@ -406,6 +411,10 @@ MKTC_ST(MKTC_CTRL_TARC_DIFFERENT) MKTC_ST(MKTC_CTRL_CONTEXT_SUSPENDED) #define MKTC_CTRL_SRCREADOPS2BLOCKED 0xAD000F06 MKTC_ST(MKTC_CTRL_SRCREADOPS2BLOCKED) +#define MKTC_CTRL_3D_WRITEOPSBLOCKED 0xAD000F07 +MKTC_ST(MKTC_CTRL_3D_WRITEOPSBLOCKED) +#define MKTC_CTRL_3D_READOPSBLOCKED 0xAD000F08 +MKTC_ST(MKTC_CTRL_3D_READOPSBLOCKED) #define MKTC_DPTA_START 0xAD001000 MKTC_ST(MKTC_DPTA_START) diff --git a/sgx/services4/include/sgxinfo.h b/sgx/services4/include/sgxinfo.h index 7340265..17f6d95 100644 --- a/sgx/services4/include/sgxinfo.h +++ b/sgx/services4/include/sgxinfo.h @@ -38,7 +38,6 @@ PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ /**************************************************************************/ #if !defined (__SGXINFO_H__) #define __SGXINFO_H__ @@ -292,7 +291,7 @@ typedef struct _SGX_CCB_KICK_ #endif IMG_BOOL bFirstKickOrResume; -#if (defined(NO_HARDWARE) || defined(PDUMP)) +#if defined(NO_HARDWARE) || defined(PDUMP) IMG_BOOL bTerminateOrAbort; #endif IMG_BOOL bLastInScene; |