mirror of
https://github.com/X11Libre/xserver.git
synced 2026-10-08 23:12:27 +00:00
Introduce a consistent coding style
This is strictly the application of the script 'x-indent-all.sh' from util/modular. Compared to the patch that Daniel posted in January, I've added a few indent flags: -bap -psl -T PrivatePtr -T pmWait -T _XFUNCPROTOBEGIN -T _XFUNCPROTOEND -T _X_EXPORT The typedefs were needed to make the output of sdksyms.sh match the previous output, otherwise, the code is formatted badly enough that sdksyms.sh generates incorrect output. The generated code was compared with the previous version and found to be essentially identical -- "assert" line numbers and BUILD_TIME were the only differences found. The comparison was done with this script: dir1=$1 dir2=$2 for dir in $dir1 $dir2; do (cd $dir && find . -name '*.o' | while read file; do dir=`dirname $file` base=`basename $file .o` dump=$dir/$base.dump objdump -d $file > $dump done) done find $dir1 -name '*.dump' | while read dump; do otherdump=`echo $dump | sed "s;$dir1;$dir2;"` diff -u $dump $otherdump done Signed-off-by: Keith Packard <keithp@keithp.com> Acked-by: Daniel Stone <daniel@fooishbar.org> Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
This commit is contained in:
Keith Packard
parent
75199129c6
commit
9838b7032e
1258 changed files with 264655 additions and 259938 deletions
|
|
@ -20,12 +20,12 @@
|
|||
|
||||
#define ALLOC_ENTRIES(x) ((V_RAM / x) - 1)
|
||||
|
||||
static CARD8 read_b(xf86Int10InfoPtr pInt,int addr);
|
||||
static CARD16 read_w(xf86Int10InfoPtr pInt,int addr);
|
||||
static CARD32 read_l(xf86Int10InfoPtr pInt,int addr);
|
||||
static void write_b(xf86Int10InfoPtr pInt,int addr, CARD8 val);
|
||||
static void write_w(xf86Int10InfoPtr pInt,int addr, CARD16 val);
|
||||
static void write_l(xf86Int10InfoPtr pInt,int addr, CARD32 val);
|
||||
static CARD8 read_b(xf86Int10InfoPtr pInt, int addr);
|
||||
static CARD16 read_w(xf86Int10InfoPtr pInt, int addr);
|
||||
static CARD32 read_l(xf86Int10InfoPtr pInt, int addr);
|
||||
static void write_b(xf86Int10InfoPtr pInt, int addr, CARD8 val);
|
||||
static void write_w(xf86Int10InfoPtr pInt, int addr, CARD16 val);
|
||||
static void write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val);
|
||||
|
||||
/*
|
||||
* the emulator cannot pass a pointer to the current xf86Int10InfoRec
|
||||
|
|
@ -35,11 +35,11 @@ static void write_l(xf86Int10InfoPtr pInt,int addr, CARD32 val);
|
|||
typedef struct {
|
||||
int shift;
|
||||
int entries;
|
||||
void* base;
|
||||
void* vRam;
|
||||
void *base;
|
||||
void *vRam;
|
||||
int highMemory;
|
||||
void* sysMem;
|
||||
char* alloc;
|
||||
void *sysMem;
|
||||
char *alloc;
|
||||
} genericInt10Priv;
|
||||
|
||||
#define INTPriv(x) ((genericInt10Priv*)x->private)
|
||||
|
|
@ -55,6 +55,7 @@ int10MemRec genericMem = {
|
|||
|
||||
static void MapVRam(xf86Int10InfoPtr pInt);
|
||||
static void UnmapVRam(xf86Int10InfoPtr pInt);
|
||||
|
||||
#ifdef _PC
|
||||
#define GET_HIGH_BASE(x) (((V_BIOS + (x) + getpagesize() - 1)/getpagesize()) \
|
||||
* getpagesize())
|
||||
|
|
@ -66,28 +67,28 @@ xf86Int10InfoPtr
|
|||
xf86ExtendedInitInt10(int entityIndex, int Flags)
|
||||
{
|
||||
xf86Int10InfoPtr pInt;
|
||||
void* base = 0;
|
||||
void* vbiosMem = 0;
|
||||
void* options = NULL;
|
||||
void *base = 0;
|
||||
void *vbiosMem = 0;
|
||||
void *options = NULL;
|
||||
int screen;
|
||||
legacyVGARec vga;
|
||||
|
||||
|
||||
screen = (xf86FindScreenForEntity(entityIndex))->scrnIndex;
|
||||
|
||||
options = xf86HandleInt10Options(xf86Screens[screen],entityIndex);
|
||||
|
||||
options = xf86HandleInt10Options(xf86Screens[screen], entityIndex);
|
||||
|
||||
if (int10skip(options)) {
|
||||
free(options);
|
||||
return NULL;
|
||||
free(options);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
pInt = (xf86Int10InfoPtr)xnfcalloc(1, sizeof(xf86Int10InfoRec));
|
||||
|
||||
pInt = (xf86Int10InfoPtr) xnfcalloc(1, sizeof(xf86Int10InfoRec));
|
||||
pInt->entityIndex = entityIndex;
|
||||
if (!xf86Int10ExecSetup(pInt))
|
||||
goto error0;
|
||||
goto error0;
|
||||
pInt->mem = &genericMem;
|
||||
pInt->private = (pointer)xnfcalloc(1, sizeof(genericInt10Priv));
|
||||
INTPriv(pInt)->alloc = (pointer)xnfcalloc(1, ALLOC_ENTRIES(getpagesize()));
|
||||
pInt->private = (pointer) xnfcalloc(1, sizeof(genericInt10Priv));
|
||||
INTPriv(pInt)->alloc = (pointer) xnfcalloc(1, ALLOC_ENTRIES(getpagesize()));
|
||||
pInt->scrnIndex = screen;
|
||||
base = INTPriv(pInt)->base = xnfalloc(SYS_BIOS);
|
||||
|
||||
|
|
@ -103,69 +104,70 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
|
|||
MapVRam(pInt);
|
||||
#ifdef _PC
|
||||
if (!sysMem)
|
||||
pci_device_map_legacy(pInt->dev, V_BIOS, BIOS_SIZE + SYS_BIOS - V_BIOS,
|
||||
PCI_DEV_MAP_FLAG_WRITABLE, &sysMem);
|
||||
pci_device_map_legacy(pInt->dev, V_BIOS, BIOS_SIZE + SYS_BIOS - V_BIOS,
|
||||
PCI_DEV_MAP_FLAG_WRITABLE, &sysMem);
|
||||
INTPriv(pInt)->sysMem = sysMem;
|
||||
|
||||
if (xf86ReadBIOS(0, 0, base, LOW_PAGE_SIZE) < 0) {
|
||||
xf86DrvMsg(screen, X_ERROR, "Cannot read int vect\n");
|
||||
goto error1;
|
||||
xf86DrvMsg(screen, X_ERROR, "Cannot read int vect\n");
|
||||
goto error1;
|
||||
}
|
||||
|
||||
/*
|
||||
* Retrieve everything between V_BIOS and SYS_BIOS as some system BIOSes
|
||||
* have executable code there.
|
||||
*/
|
||||
memset((char *)base + V_BIOS, 0, SYS_BIOS - V_BIOS);
|
||||
memset((char *) base + V_BIOS, 0, SYS_BIOS - V_BIOS);
|
||||
INTPriv(pInt)->highMemory = V_BIOS;
|
||||
|
||||
|
||||
if (xf86IsEntityPrimary(entityIndex) && !(initPrimary(options))) {
|
||||
if (!xf86int10GetBiosSegment(pInt, (unsigned char *)sysMem - V_BIOS))
|
||||
goto error1;
|
||||
if (!xf86int10GetBiosSegment(pInt, (unsigned char *) sysMem - V_BIOS))
|
||||
goto error1;
|
||||
|
||||
set_return_trap(pInt);
|
||||
set_return_trap(pInt);
|
||||
|
||||
pInt->Flags = Flags & (SET_BIOS_SCRATCH | RESTORE_BIOS_SCRATCH);
|
||||
if (! (pInt->Flags & SET_BIOS_SCRATCH))
|
||||
pInt->Flags &= ~RESTORE_BIOS_SCRATCH;
|
||||
xf86Int10SaveRestoreBIOSVars(pInt, TRUE);
|
||||
|
||||
} else {
|
||||
const BusType location_type = xf86int10GetBiosLocationType(pInt);
|
||||
int bios_location = V_BIOS;
|
||||
pInt->Flags = Flags & (SET_BIOS_SCRATCH | RESTORE_BIOS_SCRATCH);
|
||||
if (!(pInt->Flags & SET_BIOS_SCRATCH))
|
||||
pInt->Flags &= ~RESTORE_BIOS_SCRATCH;
|
||||
xf86Int10SaveRestoreBIOSVars(pInt, TRUE);
|
||||
|
||||
}
|
||||
else {
|
||||
const BusType location_type = xf86int10GetBiosLocationType(pInt);
|
||||
int bios_location = V_BIOS;
|
||||
|
||||
reset_int_vect(pInt);
|
||||
set_return_trap(pInt);
|
||||
set_return_trap(pInt);
|
||||
|
||||
switch (location_type) {
|
||||
case BUS_PCI: {
|
||||
int err;
|
||||
struct pci_device *rom_device =
|
||||
xf86GetPciInfoForEntity(pInt->entityIndex);
|
||||
switch (location_type) {
|
||||
case BUS_PCI:{
|
||||
int err;
|
||||
struct pci_device *rom_device =
|
||||
xf86GetPciInfoForEntity(pInt->entityIndex);
|
||||
|
||||
vbiosMem = (unsigned char *)base + bios_location;
|
||||
err = pci_device_read_rom(rom_device, vbiosMem);
|
||||
if (err) {
|
||||
xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS (3) %s\n",
|
||||
strerror(err));
|
||||
goto error1;
|
||||
}
|
||||
INTPriv(pInt)->highMemory = GET_HIGH_BASE(rom_device->rom_size);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
goto error1;
|
||||
}
|
||||
pInt->BIOSseg = V_BIOS >> 4;
|
||||
pInt->num = 0xe6;
|
||||
LockLegacyVGA(pInt, &vga);
|
||||
xf86ExecX86int10(pInt);
|
||||
UnlockLegacyVGA(pInt, &vga);
|
||||
vbiosMem = (unsigned char *) base + bios_location;
|
||||
err = pci_device_read_rom(rom_device, vbiosMem);
|
||||
if (err) {
|
||||
xf86DrvMsg(screen, X_ERROR, "Cannot read V_BIOS (3) %s\n",
|
||||
strerror(err));
|
||||
goto error1;
|
||||
}
|
||||
INTPriv(pInt)->highMemory = GET_HIGH_BASE(rom_device->rom_size);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
goto error1;
|
||||
}
|
||||
pInt->BIOSseg = V_BIOS >> 4;
|
||||
pInt->num = 0xe6;
|
||||
LockLegacyVGA(pInt, &vga);
|
||||
xf86ExecX86int10(pInt);
|
||||
UnlockLegacyVGA(pInt, &vga);
|
||||
}
|
||||
#else
|
||||
if (!sysMem) {
|
||||
sysMem = xnfalloc(BIOS_SIZE);
|
||||
setup_system_bios(sysMem);
|
||||
sysMem = xnfalloc(BIOS_SIZE);
|
||||
setup_system_bios(sysMem);
|
||||
}
|
||||
INTPriv(pInt)->sysMem = sysMem;
|
||||
setup_int_vect(pInt);
|
||||
|
|
@ -174,11 +176,11 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
|
|||
/* Retrieve the entire legacy video BIOS segment. This can be upto
|
||||
* 128KiB.
|
||||
*/
|
||||
vbiosMem = (char *)base + V_BIOS;
|
||||
vbiosMem = (char *) base + V_BIOS;
|
||||
memset(vbiosMem, 0, 2 * V_BIOS_SIZE);
|
||||
if (pci_device_read_rom(pInt->dev, vbiosMem) < V_BIOS_SIZE) {
|
||||
xf86DrvMsg(screen, X_WARNING,
|
||||
"Unable to retrieve all of segment 0x0C0000.\n");
|
||||
xf86DrvMsg(screen, X_WARNING,
|
||||
"Unable to retrieve all of segment 0x0C0000.\n");
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -186,29 +188,30 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
|
|||
* it).
|
||||
*/
|
||||
{
|
||||
int bios_location = V_BIOS;
|
||||
Bool done = FALSE;
|
||||
vbiosMem = (unsigned char *)base + bios_location;
|
||||
|
||||
if (xf86IsEntityPrimary(entityIndex)) {
|
||||
if (int10_check_bios(screen, bios_location >> 4, vbiosMem))
|
||||
done = TRUE;
|
||||
else
|
||||
xf86DrvMsg(screen,X_INFO,
|
||||
"No legacy BIOS found -- trying PCI\n");
|
||||
}
|
||||
if (!done) {
|
||||
int err;
|
||||
struct pci_device *rom_device =
|
||||
xf86GetPciInfoForEntity(pInt->entityIndex);
|
||||
int bios_location = V_BIOS;
|
||||
Bool done = FALSE;
|
||||
|
||||
err = pci_device_read_rom(rom_device, vbiosMem);
|
||||
if (err) {
|
||||
xf86DrvMsg(screen,X_ERROR,"Cannot read V_BIOS (5) %s\n",
|
||||
strerror(err));
|
||||
goto error1;
|
||||
}
|
||||
}
|
||||
vbiosMem = (unsigned char *) base + bios_location;
|
||||
|
||||
if (xf86IsEntityPrimary(entityIndex)) {
|
||||
if (int10_check_bios(screen, bios_location >> 4, vbiosMem))
|
||||
done = TRUE;
|
||||
else
|
||||
xf86DrvMsg(screen, X_INFO,
|
||||
"No legacy BIOS found -- trying PCI\n");
|
||||
}
|
||||
if (!done) {
|
||||
int err;
|
||||
struct pci_device *rom_device =
|
||||
xf86GetPciInfoForEntity(pInt->entityIndex);
|
||||
|
||||
err = pci_device_read_rom(rom_device, vbiosMem);
|
||||
if (err) {
|
||||
xf86DrvMsg(screen, X_ERROR, "Cannot read V_BIOS (5) %s\n",
|
||||
strerror(err));
|
||||
goto error1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pInt->BIOSseg = V_BIOS >> 4;
|
||||
|
|
@ -228,7 +231,7 @@ xf86ExtendedInitInt10(int entityIndex, int Flags)
|
|||
error0:
|
||||
free(pInt);
|
||||
free(options);
|
||||
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
|
@ -238,7 +241,8 @@ MapVRam(xf86Int10InfoPtr pInt)
|
|||
int pagesize = getpagesize();
|
||||
int size = ((VRAM_SIZE + pagesize - 1) / pagesize) * pagesize;
|
||||
|
||||
pci_device_map_legacy(pInt->dev, V_RAM, size, PCI_DEV_MAP_FLAG_WRITABLE, &(INTPriv(pInt)->vRam));
|
||||
pci_device_map_legacy(pInt->dev, V_RAM, size, PCI_DEV_MAP_FLAG_WRITABLE,
|
||||
&(INTPriv(pInt)->vRam));
|
||||
pInt->io = pci_legacy_open_io(pInt->dev, 0, 64 * 1024);
|
||||
}
|
||||
|
||||
|
|
@ -247,7 +251,7 @@ UnmapVRam(xf86Int10InfoPtr pInt)
|
|||
{
|
||||
int screen = pInt->scrnIndex;
|
||||
int pagesize = getpagesize();
|
||||
int size = ((VRAM_SIZE + pagesize - 1)/pagesize) * pagesize;
|
||||
int size = ((VRAM_SIZE + pagesize - 1) / pagesize) * pagesize;
|
||||
|
||||
pci_device_unmap_legacy(pInt->dev, INTPriv(pInt)->vRam, size);
|
||||
pci_device_close_io(pInt->dev, pInt->io);
|
||||
|
|
@ -265,12 +269,12 @@ void
|
|||
xf86FreeInt10(xf86Int10InfoPtr pInt)
|
||||
{
|
||||
if (!pInt)
|
||||
return;
|
||||
return;
|
||||
#if defined (_PC)
|
||||
xf86Int10SaveRestoreBIOSVars(pInt, FALSE);
|
||||
#endif
|
||||
if (Int10Current == pInt)
|
||||
Int10Current = NULL;
|
||||
Int10Current = NULL;
|
||||
free(INTPriv(pInt)->base);
|
||||
UnmapVRam(pInt);
|
||||
free(INTPriv(pInt)->alloc);
|
||||
|
|
@ -283,49 +287,50 @@ xf86Int10AllocPages(xf86Int10InfoPtr pInt, int num, int *off)
|
|||
{
|
||||
int pagesize = getpagesize();
|
||||
int num_pages = ALLOC_ENTRIES(pagesize);
|
||||
int i,j;
|
||||
int i, j;
|
||||
|
||||
for (i = 0; i < (num_pages - num); i++) {
|
||||
if (INTPriv(pInt)->alloc[i] == 0) {
|
||||
for (j = i; j < (num + i); j++)
|
||||
if (INTPriv(pInt)->alloc[j] != 0)
|
||||
break;
|
||||
if (j == (num + i))
|
||||
break;
|
||||
i += num;
|
||||
}
|
||||
if (INTPriv(pInt)->alloc[i] == 0) {
|
||||
for (j = i; j < (num + i); j++)
|
||||
if (INTPriv(pInt)->alloc[j] != 0)
|
||||
break;
|
||||
if (j == (num + i))
|
||||
break;
|
||||
i += num;
|
||||
}
|
||||
}
|
||||
if (i == (num_pages - num))
|
||||
return NULL;
|
||||
return NULL;
|
||||
|
||||
for (j = i; j < (i + num); j++)
|
||||
INTPriv(pInt)->alloc[j] = 1;
|
||||
INTPriv(pInt)->alloc[j] = 1;
|
||||
|
||||
*off = (i + 1) * pagesize;
|
||||
|
||||
return (char *)INTPriv(pInt)->base + *off;
|
||||
return (char *) INTPriv(pInt)->base + *off;
|
||||
}
|
||||
|
||||
void
|
||||
xf86Int10FreePages(xf86Int10InfoPtr pInt, void *pbase, int num)
|
||||
{
|
||||
int pagesize = getpagesize();
|
||||
int first = (((char *)pbase - (char *)INTPriv(pInt)->base) / pagesize) - 1;
|
||||
int first =
|
||||
(((char *) pbase - (char *) INTPriv(pInt)->base) / pagesize) - 1;
|
||||
int i;
|
||||
|
||||
for (i = first; i < (first + num); i++)
|
||||
INTPriv(pInt)->alloc[i] = 0;
|
||||
INTPriv(pInt)->alloc[i] = 0;
|
||||
}
|
||||
|
||||
#define OFF(addr) ((addr) & 0xffff)
|
||||
#if defined _PC
|
||||
# define HIGH_OFFSET (INTPriv(pInt)->highMemory)
|
||||
# define HIGH_BASE V_BIOS
|
||||
#define HIGH_OFFSET (INTPriv(pInt)->highMemory)
|
||||
#define HIGH_BASE V_BIOS
|
||||
#else
|
||||
# define HIGH_OFFSET SYS_BIOS
|
||||
# define HIGH_BASE SYS_BIOS
|
||||
#define HIGH_OFFSET SYS_BIOS
|
||||
#define HIGH_BASE SYS_BIOS
|
||||
#endif
|
||||
# define SYS(addr) ((addr) >= HIGH_OFFSET)
|
||||
#define SYS(addr) ((addr) >= HIGH_OFFSET)
|
||||
#define V_ADDR(addr) \
|
||||
(SYS(addr) ? ((char*)INTPriv(pInt)->sysMem) + (addr - HIGH_BASE) \
|
||||
: (((char*)(INTPriv(pInt)->base) + addr)))
|
||||
|
|
@ -371,7 +376,7 @@ read_w(xf86Int10InfoPtr pInt, int addr)
|
|||
{
|
||||
#if X_BYTE_ORDER == X_LITTLE_ENDIAN
|
||||
if (OFF(addr + 1) > 0)
|
||||
return V_ADDR_RW(addr);
|
||||
return V_ADDR_RW(addr);
|
||||
#endif
|
||||
return V_ADDR_RB(addr) | (V_ADDR_RB(addr + 1) << 8);
|
||||
}
|
||||
|
|
@ -381,26 +386,26 @@ read_l(xf86Int10InfoPtr pInt, int addr)
|
|||
{
|
||||
#if X_BYTE_ORDER == X_LITTLE_ENDIAN
|
||||
if (OFF(addr + 3) > 2)
|
||||
return V_ADDR_RL(addr);
|
||||
return V_ADDR_RL(addr);
|
||||
#endif
|
||||
return V_ADDR_RB(addr) |
|
||||
(V_ADDR_RB(addr + 1) << 8) |
|
||||
(V_ADDR_RB(addr + 2) << 16) |
|
||||
(V_ADDR_RB(addr + 3) << 24);
|
||||
(V_ADDR_RB(addr + 1) << 8) |
|
||||
(V_ADDR_RB(addr + 2) << 16) | (V_ADDR_RB(addr + 3) << 24);
|
||||
}
|
||||
|
||||
static void
|
||||
write_b(xf86Int10InfoPtr pInt, int addr, CARD8 val)
|
||||
{
|
||||
V_ADDR_WB(addr,val);
|
||||
V_ADDR_WB(addr, val);
|
||||
}
|
||||
|
||||
static void
|
||||
write_w(xf86Int10InfoPtr pInt, int addr, CARD16 val)
|
||||
{
|
||||
#if X_BYTE_ORDER == X_LITTLE_ENDIAN
|
||||
if (OFF(addr + 1) > 0)
|
||||
{ V_ADDR_WW(addr, val); }
|
||||
if (OFF(addr + 1) > 0) {
|
||||
V_ADDR_WW(addr, val);
|
||||
}
|
||||
#endif
|
||||
V_ADDR_WB(addr, val);
|
||||
V_ADDR_WB(addr + 1, val >> 8);
|
||||
|
|
@ -410,8 +415,9 @@ static void
|
|||
write_l(xf86Int10InfoPtr pInt, int addr, CARD32 val)
|
||||
{
|
||||
#if X_BYTE_ORDER == X_LITTLE_ENDIAN
|
||||
if (OFF(addr + 3) > 2)
|
||||
{ V_ADDR_WL(addr, val); }
|
||||
if (OFF(addr + 3) > 2) {
|
||||
V_ADDR_WL(addr, val);
|
||||
}
|
||||
#endif
|
||||
V_ADDR_WB(addr, val);
|
||||
V_ADDR_WB(addr + 1, val >> 8);
|
||||
|
|
|
|||
Loading…
Reference in a new issue