From 495a93a1fb9b4ae4f4a36c55b8fa1d900286f283 Mon Sep 17 00:00:00 2001
From: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
Date: Wed, 30 Jul 2014 18:00:39 +0530
Subject: [PATCH] osd: Manually modified osd driver source files

Modified xosd_g.c and xosd_intr.c files of osd_v4_0

Signed-off-by: Jagannadha Sutradharudu Teki <jaganna@xilinx.com>
---
 XilinxProcessorIPLib/drivers/osd/src/xosd_g.c | 45 ++++++-------------
 .../drivers/osd/src/xosd_intr.c               |  6 +--
 2 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/XilinxProcessorIPLib/drivers/osd/src/xosd_g.c b/XilinxProcessorIPLib/drivers/osd/src/xosd_g.c
index efa0e019..c7133f0a 100755
--- a/XilinxProcessorIPLib/drivers/osd/src/xosd_g.c
+++ b/XilinxProcessorIPLib/drivers/osd/src/xosd_g.c
@@ -1,34 +1,17 @@
-/******************************************************************************
-*
-* Copyright (C) 2009 - 2014 Xilinx, Inc.  All rights reserved.
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notice and this permission notice shall be included in
-* all copies or substantial portions of the Software.
-*
-* Use of the Software is limited solely to applications:
-* (a) running on a Xilinx device, or
-* (b) that interact with a Xilinx device through a bus or interconnect.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* XILINX CONSORTIUM 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.
-*
-* Except as contained in this notice, the name of the Xilinx shall not be used
-* in advertising or otherwise to promote the sale, use or other dealings in
-* this Software without prior written authorization from Xilinx.
-*
-******************************************************************************/
+
+/*******************************************************************
+*
+* CAUTION: This file is automatically generated by HSM.
+* Version: 
+* DO NOT EDIT.
+*
+*  v (64-bit)
+SW Build (by) on
+Copyright 1986-2014 Xilinx, Inc. All Rights reserved.
+*
+* Description: Driver configuration
+*
+*******************************************************************/
 
 #include "xparameters.h"
 #include "xosd.h"
diff --git a/XilinxProcessorIPLib/drivers/osd/src/xosd_intr.c b/XilinxProcessorIPLib/drivers/osd/src/xosd_intr.c
index 588ab9b9..35a4b1d4 100755
--- a/XilinxProcessorIPLib/drivers/osd/src/xosd_intr.c
+++ b/XilinxProcessorIPLib/drivers/osd/src/xosd_intr.c
@@ -113,9 +113,9 @@ void XOsd_IntrHandler(void *InstancePtr)
 	PendingIntr = (u32)(XOsd_IntrGetPending(XOsdPtr));
 
 	/* Error interrupt is occurring or spurious interrupt. */
-	if (((PendingIntr) & (XOSD_IXR_ERR_MASK)) ==
-				((XOSD_IXR_ERR_MASK))) {
-		ErrorStatus = (PendingIntr) & (XOSD_IXR_ERR_MASK);
+	if (((PendingIntr) & (XOSD_IXR_ALLERR_MASK)) ==
+				((XOSD_IXR_ALLERR_MASK))) {
+		ErrorStatus = (PendingIntr) & (XOSD_IXR_ALLERR_MASK);
 		XOsdPtr->ErrCallBack(XOsdPtr->ErrRef, ErrorStatus);
 	}