diff options
Diffstat (limited to 'vidix')
39 files changed, 13234 insertions, 13236 deletions
diff --git a/vidix/AsmMacros.h b/vidix/AsmMacros.h index c202fd4cec..8cf052b916 100644 --- a/vidix/AsmMacros.h +++ b/vidix/AsmMacros.h @@ -2,24 +2,24 @@ /* * (c) Copyright 1993,1994 by David Wexelblat <dwex@xfree86.org> * - * 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 + * 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. - * + * * 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 - * DAVID WEXELBLAT 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 + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * DAVID WEXELBLAT 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 David Wexelblat shall not be * used in advertising or otherwise to promote the sale, use or other dealings * in this Software without prior written authorization from David Wexelblat. @@ -28,32 +28,32 @@ /* * Copyright 1997 * Digital Equipment Corporation. All rights reserved. - * This software is furnished under license and may be used and copied only in - * accordance with the following terms and conditions. Subject to these - * conditions, you may download, copy, install, use, modify and distribute - * this software in source and/or binary form. No title or ownership is + * This software is furnished under license and may be used and copied only in + * accordance with the following terms and conditions. Subject to these + * conditions, you may download, copy, install, use, modify and distribute + * this software in source and/or binary form. No title or ownership is * transferred hereby. * - * 1) Any source code used, modified or distributed must reproduce and retain + * 1) Any source code used, modified or distributed must reproduce and retain * this copyright notice and list of conditions as they appear in the source * file. * - * 2) No right is granted to use any trade name, trademark, or logo of Digital - * Equipment Corporation. Neither the "Digital Equipment Corporation" name - * nor any trademark or logo of Digital Equipment Corporation may be used - * to endorse or promote products derived from this software without the + * 2) No right is granted to use any trade name, trademark, or logo of Digital + * Equipment Corporation. Neither the "Digital Equipment Corporation" name + * nor any trademark or logo of Digital Equipment Corporation may be used + * to endorse or promote products derived from this software without the * prior written permission of Digital Equipment Corporation. * - * 3) This software is provided "AS-IS" and any express or implied warranties, - * including but not limited to, any implied warranties of merchantability, - * fitness for a particular purpose, or non-infringement are disclaimed. In - * no event shall DIGITAL be liable for any damages whatsoever, and in - * particular, DIGITAL shall not be liable for special, indirect, - * consequential, or incidental damages or damages for - * lost profits, loss of revenue or loss of use, whether such damages arise - * in contract, - * negligence, tort, under statute, in equity, at law or otherwise, even if - * advised of the possibility of such damage. + * 3) This software is provided "AS-IS" and any express or implied warranties, + * including but not limited to, any implied warranties of merchantability, + * fitness for a particular purpose, or non-infringement are disclaimed. In + * no event shall DIGITAL be liable for any damages whatsoever, and in + * particular, DIGITAL shall not be liable for special, indirect, + * consequential, or incidental damages or damages for + * lost profits, loss of revenue or loss of use, whether such damages arise + * in contract, + * negligence, tort, under statute, in equity, at law or otherwise, even if + * advised of the possibility of such damage. * */ diff --git a/vidix/cyberblade_vid.c b/vidix/cyberblade_vid.c index 558d915acb..f46095a3da 100644 --- a/vidix/cyberblade_vid.c +++ b/vidix/cyberblade_vid.c @@ -59,7 +59,7 @@ static FILE *logfile=0; #define LOGWRITE(x) #endif -/* Helper functions for reading registers. */ +/* Helper functions for reading registers. */ static void CROUTW(int reg,int val) { @@ -159,7 +159,7 @@ static int cyberblade_probe(int verbose, int force) static int cyberblade_init(void) { - cyberblade_mem = map_phys_mem(pci_info.base0, 0x800000); + cyberblade_mem = map_phys_mem(pci_info.base0, 0x800000); enable_app_io(); save_colourkey[0]=SRINB(0x50); save_colourkey[1]=SRINB(0x51); @@ -191,7 +191,7 @@ static void cyberblade_destroy(void) SROUTB(0x56,save_colourkey[5]); SROUTB(0x11, protect); disable_app_io(); - unmap_phys_mem(cyberblade_mem, 0x800000); + unmap_phys_mem(cyberblade_mem, 0x800000); } @@ -441,19 +441,19 @@ static int cyberblade_config_playback(vidix_playback_t *info) Overflow=CRINB(0x07); VDisp |= (Overflow & 2) <<7; VDisp |= (Overflow & 0x40) << 3; - + TVHTotal=CRINB(0xe0)*8; TVVTotal=CRINB(0xe6); TVOverflow=CRINB(0xe7); if(TVOverflow&0x20) TVVTotal|=512; if(TVOverflow&0x01) TVVTotal|=256; TVHTotal+=40; TVVTotal+=2; - + TVHSyncStart=CRINB(0xe4)*8; TVVSyncStart=CRINB(0xf0); if(TVOverflow&0x80) TVVSyncStart|=512; if(TVOverflow&0x04) TVVSyncStart|=256; - + HWinStart=(TVHTotal-HDisp)&15; HWinStart|=(HTotal-HDisp)&15; HWinStart+=(TVHTotal-TVHSyncStart)-49; @@ -465,7 +465,7 @@ static int cyberblade_config_playback(vidix_playback_t *info) } VWinStart=(VTotal-VSync)-8; - printf("[cyberblade] HTotal: 0x%x, HSStart: 0x%x\n",HTotal,HSync); + printf("[cyberblade] HTotal: 0x%x, HSStart: 0x%x\n",HTotal,HSync); printf(" VTotal: 0x%x, VStart: 0x%x\n",VTotal,VSync); tx1=HWinStart+info->dest.x; ty1=VWinStart+info->dest.y; @@ -562,7 +562,7 @@ static int cyberblade_playback_on(void) static int cyberblade_playback_off(void) { - LOGWRITE("Disable overlay\n"); + LOGWRITE("Disable overlay\n"); CROUTB(0x8E, 0xc4); /* VDE Flags*/ return 0; @@ -572,7 +572,7 @@ static int cyberblade_playback_off(void) static int cyberblade_frame_sel(unsigned int frame) { int protect; - LOGWRITE("Frame select\n"); + LOGWRITE("Frame select\n"); protect=SRINB(0x11); SROUTB(0x11, 0x92); /* Set overlay address to that of selected frame */ diff --git a/vidix/dha.c b/vidix/dha.c index 8a2d8fd1cd..4e5d5395ef 100644 --- a/vidix/dha.c +++ b/vidix/dha.c @@ -90,7 +90,7 @@ static int mem_fd = -1; void *map_phys_mem(unsigned long base, unsigned long size) -{ +{ #if ARCH_ALPHA /* TODO: move it into sysdep */ base += bus_base(); @@ -121,12 +121,12 @@ dha_helper_way: else { dhahelper_memory_t mem_req; - + mem_req.operation = MEMORY_OP_MAP; mem_req.start = base; mem_req.offset = 0; mem_req.size = size; - + if (ioctl(mem_fd, DHAHELPER_MEMORY, &mem_req) < 0) { perror("libdha: DHA kernelhelper failed"); @@ -176,10 +176,10 @@ void unmap_phys_mem(void *ptr, unsigned long size) perror("libdha: unmapping memory failed"); return; } - + close(mem_fd); mem_fd = -1; - + return; } diff --git a/vidix/dhahelper/dhahelper.c b/vidix/dhahelper/dhahelper.c index 8c1dc27e4f..498f6537e6 100644 --- a/vidix/dhahelper/dhahelper.c +++ b/vidix/dhahelper/dhahelper.c @@ -34,10 +34,10 @@ Usage: mknod -m 666 /dev/dhahelper c 180 0 - + Also you can change the major number, setting the "dhahelper_major" module parameter, the default is 180, specified in dhahelper.h. - + Note: do not use other than minor==0, the module forbids it. TODO: @@ -236,7 +236,7 @@ static int dhahelper_ioctl(struct inode *inode, struct file *file, printk(KERN_ERR "dhahelper: failed copy to userspace\n"); return -EFAULT; } - + break; } case DHAHELPER_MEMORY: @@ -249,7 +249,7 @@ static int dhahelper_ioctl(struct inode *inode, struct file *file, printk(KERN_ERR "dhahelper: failed copy from userspace\n"); return -EFAULT; } - + switch(mem.operation) { case MEMORY_OP_MAP: @@ -271,14 +271,14 @@ static int dhahelper_ioctl(struct inode *inode, struct file *file, mem.operation); return -EINVAL; } - + if (copy_to_user((dhahelper_memory_t *)arg, &mem, sizeof(dhahelper_memory_t))) { if (dhahelper_verbosity > 0) printk(KERN_ERR "dhahelper: failed copy to userspace\n"); return -EFAULT; } - + break; } default: @@ -298,11 +298,11 @@ static int dhahelper_mmap(struct file *file, struct vm_area_struct *vma) printk(KERN_ERR "dhahelper: mapping not requested before mmap\n"); return -EFAULT; } - + if (dhahelper_verbosity > 1) printk(KERN_INFO "dhahelper: mapping %x (size: %x)\n", last_mem_request.start+last_mem_request.offset, last_mem_request.size); - + if (remap_page_range(0, last_mem_request.start + last_mem_request.offset, last_mem_request.size, vma->vm_page_prot)) { @@ -342,7 +342,7 @@ static struct file_operations dhahelper_fops = #if KERNEL_VERSION < KERNEL_VERSION(2,4,0) int init_module(void) -#else +#else static int __init init_dhahelper(void) #endif { @@ -355,7 +355,7 @@ static int __init init_dhahelper(void) dhahelper_major); return -EIO; } - + return 0; } diff --git a/vidix/dhahelper/test.c b/vidix/dhahelper/test.c index 78f8250d99..59e356efea 100644 --- a/vidix/dhahelper/test.c +++ b/vidix/dhahelper/test.c @@ -27,7 +27,7 @@ #include <errno.h> #include <fcntl.h> #include <sys/mman.h> - + #include "dhahelper.h" int main(int argc, char *argv[]) @@ -58,13 +58,13 @@ int main(int argc, char *argv[]) printf("ret: %s\n", strerror(errno)); mem.ret = (int)mmap(NULL, (size_t)mem.size, PROT_READ, MAP_SHARED, fd, (off_t)0); - printf("allocated to %x\n", mem.ret); + printf("allocated to %x\n", mem.ret); if (argc > 1) if (mem.ret != 0) { int i; - + for (i = 0; i < 256; i++) printf("[%x] ", *(int *)(mem.ret+i)); printf("\n"); diff --git a/vidix/dhahelperwin/dhahelper.c b/vidix/dhahelperwin/dhahelper.c index 2289738792..702f3e52c1 100644 --- a/vidix/dhahelperwin/dhahelper.c +++ b/vidix/dhahelperwin/dhahelper.c @@ -87,7 +87,7 @@ STDCALL NTSTATUS DriverEntry (IN PDRIVER_OBJECT DriverObject,IN PUNICODE_STRING // can make requests to this device). ntStatus = IoCreateDevice(DriverObject,0,&DeviceNameUnicodeString,FILE_DEVICE_DHAHELPER,0,TRUE,&DeviceObject); - + if (NT_SUCCESS(ntStatus)){ // Create dispatch points for device control, create, close. DriverObject->MajorFunction[IRP_MJ_CREATE] = @@ -134,7 +134,7 @@ static STDCALL NTSTATUS dhahelperdispatch(IN PDEVICE_OBJECT DeviceObject,IN PIRP Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; - + IrpStack = IoGetCurrentIrpStackLocation(Irp); // Get the pointer to the input/output buffer and it's length @@ -225,7 +225,7 @@ static STDCALL void dhahelperunload(IN PDRIVER_OBJECT DriverObject){ NTSTATUS ntStatus=STATUS_SUCCESS; OutputDebugString ("dhahelper: entering dhahelperunload"); OutputDebugString ("dhahelper: unmapping remaining memory"); - + while(alloccount && (ntStatus==STATUS_SUCCESS))ntStatus = UnmapPhysicalMemory(alloclist[alloccount-1].UserVirtualAddress); RtlInitUnicodeString (&DeviceLinkUnicodeString, L"\\DosDevices\\DHAHELPER"); ntStatus = IoDeleteSymbolicLink (&DeviceLinkUnicodeString); @@ -260,7 +260,7 @@ static STDCALL NTSTATUS MapPhysicalMemoryToLinearSpace(PVOID pPhysAddress,ULONG PVOID UserVirtualAddress=NULL; PHYSICAL_ADDRESS pStartPhysAddress; OutputDebugString ("dhahelper: entering MapPhysicalMemoryToLinearSpace"); - + #ifdef _WIN64 pStartPhysAddress.QuadPart = (ULONGLONG)pPhysAddress; #else @@ -273,7 +273,7 @@ static STDCALL NTSTATUS MapPhysicalMemoryToLinearSpace(PVOID pPhysAddress,ULONG if(!SystemVirtualAddress){ OutputDebugString("dhahelper: MmMapIoSpace failed"); return STATUS_INVALID_PARAMETER; - } + } OutputDebugString("dhahelper: SystemVirtualAddress 0x%x",SystemVirtualAddress); Mdl=IoAllocateMdl(SystemVirtualAddress, PhysMemSizeInBytes, FALSE, FALSE,NULL); if(!Mdl){ @@ -293,22 +293,22 @@ static STDCALL NTSTATUS MapPhysicalMemoryToLinearSpace(PVOID pPhysAddress,ULONG } OutputDebugString("dhahelper: UserVirtualAddress 0x%x",UserVirtualAddress); #ifndef NO_SEH - }__except(EXCEPTION_EXECUTE_HANDLER){ - NTSTATUS ntStatus; - ntStatus = GetExceptionCode(); + }__except(EXCEPTION_EXECUTE_HANDLER){ + NTSTATUS ntStatus; + ntStatus = GetExceptionCode(); OutputDebugString("dhahelper: MapPhysicalMemoryToLinearSpace failed due to exception 0x%0x\n", ntStatus); - return ntStatus; + return ntStatus; } #endif - + OutputDebugString("dhahelper: adding data to internal allocation list"); alloclisttmp=MmAllocateNonCachedMemory((alloccount+1)*sizeof(alloc_priv)); - + if(!alloclisttmp){ OutputDebugString("dhahelper: not enough memory to create temporary allocation list"); - MmUnmapLockedPages(UserVirtualAddress, Mdl); + MmUnmapLockedPages(UserVirtualAddress, Mdl); IoFreeMdl(Mdl); return STATUS_INSUFFICIENT_RESOURCES; } @@ -322,9 +322,9 @@ static STDCALL NTSTATUS MapPhysicalMemoryToLinearSpace(PVOID pPhysAddress,ULONG alloclist[alloccount].UserVirtualAddress=UserVirtualAddress; alloclist[alloccount].PhysMemSizeInBytes=PhysMemSizeInBytes; ++alloccount; - - *PhysMemLin=UserVirtualAddress; - + + *PhysMemLin=UserVirtualAddress; + OutputDebugString("dhahelper: leaving MapPhysicalMemoryToLinearSpace"); return STATUS_SUCCESS; } @@ -338,7 +338,7 @@ static STDCALL NTSTATUS UnmapPhysicalMemory(PVOID UserVirtualAddress){ OutputDebugString("dhahelper: UnmapPhysicalMemory: nothing todo -> leaving..."); return STATUS_SUCCESS; } - + for(i=0;i<alloccount;i++){ if(alloclist[i].UserVirtualAddress!=UserVirtualAddress){ if(x!=i){ @@ -346,7 +346,7 @@ static STDCALL NTSTATUS UnmapPhysicalMemory(PVOID UserVirtualAddress){ alloclist[x].SystemVirtualAddress=alloclist[i].SystemVirtualAddress; alloclist[x].UserVirtualAddress=alloclist[i].UserVirtualAddress; alloclist[x].PhysMemSizeInBytes=alloclist[i].PhysMemSizeInBytes; - + } x++; } @@ -355,23 +355,23 @@ static STDCALL NTSTATUS UnmapPhysicalMemory(PVOID UserVirtualAddress){ #ifndef NO_SEH __try { #endif - MmUnmapLockedPages(alloclist[x].UserVirtualAddress, alloclist[x].Mdl); + MmUnmapLockedPages(alloclist[x].UserVirtualAddress, alloclist[x].Mdl); IoFreeMdl(alloclist[x].Mdl); - MmUnmapIoSpace(alloclist[x].SystemVirtualAddress,alloclist[x].PhysMemSizeInBytes); + MmUnmapIoSpace(alloclist[x].SystemVirtualAddress,alloclist[x].PhysMemSizeInBytes); #ifndef NO_SEH - }__except(EXCEPTION_EXECUTE_HANDLER){ - NTSTATUS ntStatus; - ntStatus = GetExceptionCode(); + }__except(EXCEPTION_EXECUTE_HANDLER){ + NTSTATUS ntStatus; + ntStatus = GetExceptionCode(); OutputDebugString("dhahelper: UnmapPhysicalMemory failed due to exception 0x%0x (Mdl 0x%x)\n", ntStatus,alloclist[x].Mdl); - return ntStatus; + return ntStatus; } #endif } alloccounttmp--; } - + } - + if(alloccounttmp){ alloc_priv* alloclisttmp; alloclisttmp=MmAllocateNonCachedMemory(alloccounttmp*sizeof(alloc_priv)); @@ -384,7 +384,7 @@ static STDCALL NTSTATUS UnmapPhysicalMemory(PVOID UserVirtualAddress){ alloclist=alloclisttmp; } alloccount=alloccounttmp; - + OutputDebugString("dhahelper: leaving UnmapPhysicalMemory"); return STATUS_SUCCESS; } diff --git a/vidix/dhahelperwin/dhasetup.c b/vidix/dhahelperwin/dhasetup.c index be593edae5..8642fa490c 100644 --- a/vidix/dhahelperwin/dhasetup.c +++ b/vidix/dhahelperwin/dhasetup.c @@ -83,7 +83,7 @@ int main(int argc,char* argv[]){ print_last_error("Unable to register DhaHelper Service"); return 1; } - + if(!StartService(hService, 0, NULL)){ print_last_error("Error while starting service"); return 1; diff --git a/vidix/drivers.c b/vidix/drivers.c index 6d427b1e2b..559dee30e0 100644 --- a/vidix/drivers.c +++ b/vidix/drivers.c @@ -51,7 +51,7 @@ extern VDXDriver unichrome_drv; static void vidix_register_driver (VDXDriver *drv) { VDXDriver **d; - + d = &first_driver; while (*d != NULL) d = &(*d)->next; @@ -126,7 +126,7 @@ static int vidix_probe_driver (VDXContext *ctx, VDXDriver *drv, drv->name); return 0; } - + if (verbose) printf ("vidixlib: %s probed o'k\n", drv->name); @@ -146,7 +146,7 @@ static void vidix_list_drivers (void) vidix_capability_t cap; drv->get_caps (&cap); printf (" * %s - %s\n", drv->name, cap.name); - drv = drv->next; + drv = drv->next; } } @@ -161,7 +161,7 @@ int vidix_find_driver (VDXContext *ctx, const char *name, ctx->drv = NULL; return 0; } - + drv = first_driver; while (drv) { diff --git a/vidix/glint_regs.h b/vidix/glint_regs.h index c61fe69c23..807ca58352 100644 --- a/vidix/glint_regs.h +++ b/vidix/glint_regs.h @@ -1,7 +1,7 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glint/glint_regs.h,v 1.31 2001/12/08 16:01:52 alanh Exp $ */ /* - * glint register file + * glint register file * * Copyright by Stefan Dirsch, Dirk Hohndel, Alan Hourihane * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> @@ -12,7 +12,7 @@ * this work is sponsored by S.u.S.E. GmbH, Fuerth, Elsa GmbH, Aachen and * Siemens Nixdorf Informationssysteme * - */ + */ #ifndef MPLAYER_GLINT_REGS_H #define MPLAYER_GLINT_REGS_H @@ -45,7 +45,7 @@ #define CFGIntLine 0x3c /* Base Adresses */ -#define CFGBaseAddr0 0x10 +#define CFGBaseAddr0 0x10 #define CFGBaseAddr1 0x14 #define CFGBaseAddr2 0x18 #define CFGBaseAddr3 0x1C @@ -164,7 +164,7 @@ #define RowCharge4 0 << 10 #define TimeRCD4 0 << 7 #define TimeRC4 0x4 << 3 - #define TimeRP4 1 + #define TimeRP4 1 #define CAS3Latency4 0 << 16 #define BootAdress4 0x10 #define NumberBanks4 1 << 29 @@ -474,7 +474,7 @@ * GLINT Core Registers * ************************/ -#define GLINT_TAG(major,offset) (((major) << 7) | ((offset) << 3)) +#define GLINT_TAG(major,offset) (((major) << 7) | ((offset) << 3)) #define GLINT_TAG_ADDR(major,offset) (0x8000 | GLINT_TAG((major),(offset))) #define UNIT_DISABLE 0 @@ -691,7 +691,7 @@ #define CDDA_FlatShading 0 /* UNIT_DISABLE */ #define CDDA_GouraudShading 0x0002 - + #define ConstantColor GLINT_TAG_ADDR(0x0f,0x0d) #define GLINTColor GLINT_TAG_ADDR(0x0f,0x0e) @@ -867,7 +867,7 @@ #define GWIN_OverrideWriteFilter (1 << 19) /* ??? is this needed, set by permedia (2) modules */ - #define GWIN_DisableLBUpdate 0x40000 + #define GWIN_DisableLBUpdate 0x40000 #define StencilMode GLINT_TAG_ADDR(0x13,0x01) #define StencilData GLINT_TAG_ADDR(0x13,0x02) @@ -1100,8 +1100,8 @@ #define DM_DiamondExit 0x0800 #define DM_NoDraw 0x1000 #define DM_ClampEnable 0x2000 - #define DM_ClampedTexParMode 0x4000 - #define DM_NormalizedTexParMode 0xC000 + #define DM_ClampedTexParMode 0x4000 + #define DM_NormalizedTexParMode 0xC000 #define DDCMD_AreaStrippleEnable 0x0001 @@ -1194,7 +1194,7 @@ do{ \ unsigned char tmp; \ while(delay--){tmp = GLINT_READ_REG(InFIFOSpace);}; \ } while(0) - + #define GLINT_MASK_WRITE_REG(v,m,r) \ GLINT_WRITE_REG((GLINT_READ_REG(r)&(m))|(v),r) @@ -1240,7 +1240,7 @@ do{ \ pGlint->ROP = rop; \ } #endif - + #define CHECKCLIPPING \ { \ if (pGlint->ClippingOn) { \ @@ -1258,7 +1258,7 @@ do{ \ REPLICATE(planemask); \ GLINT_WRITE_REG(planemask, FBHardwareWriteMask);\ } \ -} +} #else #define DO_PLANEMASK(planemask) \ { \ diff --git a/vidix/ivtv_vid.c b/vidix/ivtv_vid.c index d190894aa3..5cfc7a7e19 100644 --- a/vidix/ivtv_vid.c +++ b/vidix/ivtv_vid.c @@ -145,7 +145,7 @@ static void de_macro_uv(unsigned char *srcu, unsigned char *srcv, unsigned char *dst_2; unsigned int h_tail, w_tail; unsigned int h_size; - + // The uv plane is half the size of the y plane, so 'correct' all dimensions. w /= 2; h /= 2; @@ -263,7 +263,7 @@ int ivtv_probe(int verbose, int force) } } } - + if(ivtv_verbose) printf(IVTV_MSG"Can't find chip\n"); return ENXIO; @@ -304,7 +304,7 @@ card_found: /* Try to find YUV device */ unsigned char yuv_device_number = 48, yuv_device = 48 + fb_number; char yuv_device_name[] = "/dev/videoXXX\0"; - + do { sprintf(yuv_device_name, "/dev/video%u", yuv_device); yuvdev = open(yuv_device_name, O_RDWR); @@ -380,7 +380,7 @@ void ivtv_destroy(void) if(ivtv_verbose) printf(IVTV_MSG"destroy\n"); if(-1 != yuvdev) - close(yuvdev); + close(yuvdev); if(-1 != fbdev) close(fbdev); if(NULL != outbuf) @@ -401,7 +401,7 @@ int ivtv_query_fourcc(vidix_fourcc_t *to) { if(ivtv_verbose) printf(IVTV_MSG"query fourcc (%x)\n", to->fourcc); - + int supports = 0; switch(to->fourcc) { @@ -411,7 +411,7 @@ int ivtv_query_fourcc(vidix_fourcc_t *to) default: supports = 0; } - + if(!supports) { to->depth = to->flags = 0; return ENOTSUP; @@ -429,12 +429,12 @@ int ivtv_config_playback(vidix_playback_t *info) printf(IVTV_MSG"config playback\n"); if(2 == ivtv_verbose){ - printf(IVTV_MSG"src : x:%d y:%d w:%d h:%d\n", + printf(IVTV_MSG"src : x:%d y:%d w:%d h:%d\n", info->src.x, info->src.y, info->src.w, info->src.h); - printf(IVTV_MSG"dest: x:%d y:%d w:%d h:%d\n", + printf(IVTV_MSG"dest: x:%d y:%d w:%d h:%d\n", info->dest.x, info->dest.y, info->dest.w, info->dest.h); } - + memcpy(&destVideo, &info->dest, sizeof(vidix_rect_t)); memcpy(&srcVideo, &info->src, sizeof(vidix_rect_t)); @@ -447,7 +447,7 @@ int ivtv_config_playback(vidix_playback_t *info) info->offset.y = 0; info->offset.u = info->src.w * info->src.h; info->offset.v = info->offset.u + ((info->src.w * info->src.h)/4); - info->dga_addr = memBase = malloc(info->num_frames*info->frame_size); + info->dga_addr = memBase = malloc(info->num_frames*info->frame_size); if(ivtv_verbose) printf(IVTV_MSG"frame_size: %d, dga_addr: %p\n", info->frame_size, info->dga_addr); @@ -477,9 +477,9 @@ int ivtv_playback_on(void) int ivtv_playback_off(void) { - if(ivtv_verbose) + if(ivtv_verbose) printf(IVTV_MSG"playback off\n"); - + if(0 == alpha_disable) { #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) if (-1 != fbdev) { diff --git a/vidix/mach64.h b/vidix/mach64.h index 2ccfa5aa03..e138a9083d 100644 --- a/vidix/mach64.h +++ b/vidix/mach64.h @@ -1633,7 +1633,7 @@ This means that this sources don't support ISA and VLB cards */ # define GRAPHIC_KEY_FN_EQ 0x00000050L // EQ and NE are exchanged relative to radeon # define CMP_MIX_MASK 0x00000100L # define CMP_MIX_OR 0x00000000L -# define CMP_MIX_AND 0x00000100L +# define CMP_MIX_AND 0x00000100L /* ? BlockIOTag(0x107u) */ #define OVERLAY_SCALE_INC BlockIOTag(0x108u) #define OVERLAY_SCALE_CNTL BlockIOTag(0x109u) diff --git a/vidix/mach64_vid.c b/vidix/mach64_vid.c index dd6084d126..431ff94322 100644 --- a/vidix/mach64_vid.c +++ b/vidix/mach64_vid.c @@ -78,17 +78,17 @@ typedef struct bes_registers_s uint32_t key_cntl; uint32_t test; |