# HG changeset patch
# User henryzh <henry.zhao@oracle.com>
# Date 1455929864 28800
# Node ID d5bab34278287aaff9edc590cf1b9deea525c942
# Parent  2682cfadffdc384ceb8119e301dc959dba9ef07e
22087975 Second phase for implementing PSARC/2009/224: X changes

diff -r 2682cfadffdc -r d5bab3427828 open-src/driver/xf86-video-ast/22115519.patch
--- a/open-src/driver/xf86-video-ast/22115519.patch	Fri Feb 19 16:44:30 2016 -0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-diff --git a/src/ast.h b/src/ast.h
-index 4cae16b..ea1eb5b 100644
---- a/src/ast.h
-+++ b/src/ast.h
-@@ -1,5 +1,6 @@
- /*
-  * Copyright (c) 2005 ASPEED Technology Inc.
-+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved
-  *
-  * Permission to use, copy, modify, distribute, and sell this software and its
-  * documentation for any purpose is hereby granted without fee, provided that
-@@ -361,12 +362,6 @@ typedef struct  vis_pci_cfg {
- #define VIS_SETIOREG                    (VIOC | 17)
- #define VIS_GETIOREG                    (VIOC | 18)
- 
--#ifdef __sparc
--#define ASTIOC                  ('Y' << 8)
--#define AST_GET_INDEX          (ASTIOC | 14)
--#define AST_SET_INDEX          (ASTIOC | 15)
--#endif
--
- typedef struct vis_io_reg {
-         uchar_t         offset;
-         uchar_t         value;
-diff --git a/src/ast_vgatool.h b/src/ast_vgatool.h
-index ded26e3..71445f2 100644
---- a/src/ast_vgatool.h
-+++ b/src/ast_vgatool.h
-@@ -1,5 +1,6 @@
- /*
-  * Copyright (c) 2005 ASPEED Technology Inc.
-+ * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved
-  *
-  * Permission to use, copy, modify, distribute, and sell this software and its
-  * documentation for any purpose is hereby granted without fee, provided that
-@@ -73,6 +74,10 @@ _GetRegFromFd(uchar_t off, int fd)
-        return io_reg.value;
- }
- 
-+#define ASTIOC                  ('Y' << 8)
-+#define AST_GET_INDEX          (ASTIOC | 14)
-+#define AST_SET_INDEX          (ASTIOC | 15)
-+
- #define GetReg(off)            _GetRegFromFd(off, pAST->fd)
- 
- #define SetReg(off, val)       do {                                    \