1634N/A--- a/src/ast.h Thu Apr 28 21:02:49 2016

1634N/A+++ b/src/ast.h Thu Apr 28 21:03:25 2016

1634N/A@@ -306,66 +306,7 @@

1608N/A #define ASTPTR(p) ((ASTRecPtr)((p)->driverPrivate))

1608N/A

1608N/A #if defined(__sparc__)

1608N/A-#ifndef VIS_GETPCICONFIG

1634N/A

1608N/A-/*

1608N/A- * These definitions will be removed when they are included in the

1608N/A- * visual_io.h

1608N/A- */

1608N/A-#define VIS_GETVIDEOMODENAME (VIOC | 12)

1608N/A-#define VIS_STOREVIDEOMODENAME (VIOC | 13)

1608N/A-#define VIS_MAX_VMODE_LEN 48

1608N/A-

1608N/A-typedef struct vis_video_mode {

1608N/A- char mode_name[VIS_MAX_VMODE_LEN];

1608N/A- uint32_t vRefresh;

1608N/A- char pad[96];

1608N/A-} vis_video_mode_t;

1608N/A-

1608N/A-#define VIS_GETPCICONFIG (VIOC | 14)

1608N/A-

1608N/A-typedef struct vis_pci_cfg {

1608N/A- uint16_t VendorID;

1608N/A- uint16_t DeviceID;

1608N/A- uint16_t Command;

1608N/A- uint16_t Status;

1608N/A- uint8_t RevisionID;

1608N/A- uint8_t ProgIF;

1608N/A- uint8_t SubClass;

1608N/A- uint8_t BaseClass;

1608N/A-

1608N/A- uint8_t CacheLineSize;

1608N/A- uint8_t LatencyTimer;

1608N/A- uint8_t HeaderType;

1608N/A- uint8_t BIST;

1608N/A-

1608N/A- uint32_t bar[6];

1608N/A- uint32_t CIS;

1608N/A- uint16_t SubVendorID;

1608N/A- uint16_t SubSystemID;

1608N/A- uint32_t ROMBaseAddress;

1608N/A-

1608N/A- uint8_t CapabilitiesPtr;

1608N/A- uint8_t Reserved_1[3];

1608N/A- uint32_t Reserved_2;

1608N/A-

1608N/A- uint8_t InterruptLine;

1608N/A- uint8_t InterruptPin;

1608N/A- uint8_t MinimumGrant;

1608N/A- uint8_t MaximumLatency;

1608N/A-

1608N/A- uint8_t pad[100];

1608N/A-} vis_pci_cfg_t;

1608N/A-

1608N/A-#define VIS_SETIOREG (VIOC | 17)

1608N/A-#define VIS_GETIOREG (VIOC | 18)

1608N/A-

1608N/A-typedef struct vis_io_reg {

1608N/A- uchar_t offset;

1608N/A- uchar_t value;

1608N/A-} vis_io_reg_t;

1608N/A-#endif

1608N/A-

1608N/A extern struct pci_device *ASTGetPciInfo(ASTRecPtr);

1608N/A extern ScrnInfoPtr ASTAllocScreen(DriverPtr, GDevPtr);

1608N/A extern pointer ASTMapVidMem(ScrnInfoPtr, unsigned int, CARD32,

1634N/A--- a/src/ast_vgatool.h Thu Apr 28 21:04:02 2016

1634N/A+++ b/src/ast_vgatool.h Thu Apr 28 21:05:03 2016

1608N/A@@ -1,5 +1,6 @@

1608N/A /*

1608N/A * Copyright (c) 2005 ASPEED Technology Inc.

1634N/A+ * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.

1608N/A *

1608N/A * Permission to use, copy, modify, distribute, and sell this software and its

1608N/A * documentation for any purpose is hereby granted without fee, provided that

1608N/A@@ -48,9 +49,6 @@

1608N/A

1608N/A #if defined(__sparc__)

1608N/A

1608N/A-#define SET_IO_REG 0x1000

1608N/A-#define GET_IO_REG 0x1001

1608N/A-

1608N/A #define AR_PORT_WRITE 0x40

1608N/A #define MISC_PORT_WRITE 0x42

1608N/A #define VGA_ENABLE_PORT 0x43