From 7dbc64777a47aa3d22dad9508f6dcbb81513073d Mon Sep 17 00:00:00 2001 From: sezero Date: Thu, 9 Aug 2018 16:10:01 +0300 Subject: [PATCH] apply the commit 721b6fcf changes to h3info.h, too. [glide2x side] --- glide2x/h3/incsrc/h3info.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/glide2x/h3/incsrc/h3info.h b/glide2x/h3/incsrc/h3info.h index 97f4842..b264b11 100644 --- a/glide2x/h3/incsrc/h3info.h +++ b/glide2x/h3/incsrc/h3info.h @@ -21,6 +21,7 @@ ** COPYRIGHT 3DFX INTERACTIVE, INC. 1999, ALL RIGHTS RESERVED */ +/* #if defined(__unix__) && ! defined(__H3REGS_H__) // basic data types #define FxU8 unsigned char @@ -30,6 +31,8 @@ // defn of registers not reqd, treat (SstRegs *) as (void *) typedef void SstRegs; #endif +*/ +struct sstregs; /* see h3regs.h */ #if defined(H4) #define MAX_NUM_TMUS 2 @@ -49,7 +52,8 @@ typedef void SstRegs; typedef struct { // H3 Device Information Structure FxU32 size; // size of this structure - SstRegs *virtAddr[2]; // virtual memory base address + volatile + struct sstregs *virtAddr[2];// virtual memory base address FxU32 physAddr[2]; // physical memory base address FxU16 virtPort; // virtual i/o port base address FxU16 physPort; // physical i/o port base address @@ -85,8 +89,8 @@ typedef struct { // H3 Device Information Structure FxU32 initGrxClkDone; // CSIM specific - SstRegs *sstCSIM; // pointer to CSIM structure - SstRegs *sstHW; // pointer to HW + volatile struct sstregs *sstCSIM; // pointer to CSIM structure + volatile struct sstregs *sstHW; // pointer to HW } FxDeviceInfo; #endif /* !__H3INFO_H__ */