diff options
| author | Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk> | 2004-12-04 00:43:13 +0000 |
|---|---|---|
| committer | Markus Kuhn <Markus.Kuhn@cl.cam.ac.uk> | 2004-12-04 00:43:13 +0000 |
| commit | 44f4713a056b7a6a076b2f65fbed43e0cfe9ff06 (patch) | |
| tree | c14e6b5752d84f11a6a17019177ecb9f57f638f5 /hw/xfree86/os-support | |
| parent | f264a7ea741f57fbc3bb900cfbb9e0cc23f46e90 (diff) | |
Encoding of numerous files changed to UTF-8
Diffstat (limited to 'hw/xfree86/os-support')
| -rw-r--r-- | hw/xfree86/os-support/bsd/libusb/usb_hid_usages | 6 | ||||
| -rw-r--r-- | hw/xfree86/os-support/linux/lnx_agp.c | 14 |
2 files changed, 10 insertions, 10 deletions
diff --git a/hw/xfree86/os-support/bsd/libusb/usb_hid_usages b/hw/xfree86/os-support/bsd/libusb/usb_hid_usages index 711ba206a..02f122028 100644 --- a/hw/xfree86/os-support/bsd/libusb/usb_hid_usages +++ b/hw/xfree86/os-support/bsd/libusb/usb_hid_usages @@ -9,7 +9,7 @@ # If the number is * then the line matches all usages and the name # is a printf formatting string that will be given the usage number. # -# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/bsd/libusb/usb_hid_usages,v 1.1 2000/02/11 18:06:51 dawes Exp $ +# $XFree86: xc/programs/Xserver/hw/xfree86/os-support/libusb/usb_hid_usages,v 1.1.2.2 1999/12/03 10:12:43 hohndel Exp $ # 1 Generic Desktop 0x00 Undefined @@ -886,8 +886,8 @@ 0x48 Top Corner Distortion Balance 0x4A Bottom Corner Distortion Control 0x4C Bottom Corner Distortion Balance - 0x56 Moiré Horizontal - 0x58 Moiré Vertical + 0x56 Moiré Horizontal + 0x58 Moiré Vertical 0x5E Input Level Select 0x60 Input Source Select 0x62 Stereo Mode diff --git a/hw/xfree86/os-support/linux/lnx_agp.c b/hw/xfree86/os-support/linux/lnx_agp.c index 05e299b11..2d8bd0faa 100644 --- a/hw/xfree86/os-support/linux/lnx_agp.c +++ b/hw/xfree86/os-support/linux/lnx_agp.c @@ -3,8 +3,8 @@ * * This version is for both Linux and FreeBSD. * - * Copyright © 2000 VA Linux Systems, Inc. - * Copyright © 2001 The XFree86 Project, Inc. + * Copyright © 2000 VA Linux Systems, Inc. + * Copyright © 2001 The XFree86 Project, Inc. */ /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c,v 3.11 2003/04/03 22:47:42 dawes Exp $ */ @@ -263,14 +263,14 @@ xf86BindGARTMemory(int screenNum, int key, unsigned long offset) if (offset % AGP_PAGE_SIZE != 0) { xf86DrvMsg(screenNum, X_WARNING, "xf86BindGARTMemory: " - "offset (0x%x) is not page-aligned (%d)\n", + "offset (0x%lx) is not page-aligned (%d)\n", offset, AGP_PAGE_SIZE); return FALSE; } pageOffset = offset / AGP_PAGE_SIZE; xf86DrvMsgVerb(screenNum, X_INFO, 3, - "xf86BindGARTMemory: bind key %d at 0x%08x " + "xf86BindGARTMemory: bind key %d at 0x%08lx " "(pgoffset %d)\n", key, offset, pageOffset); bind.pg_start = pageOffset; @@ -279,7 +279,7 @@ xf86BindGARTMemory(int screenNum, int key, unsigned long offset) if (ioctl(gartFd, AGPIOC_BIND, &bind) != 0) { xf86DrvMsg(screenNum, X_WARNING, "xf86BindGARTMemory: " "binding of gart memory with key %d\n" - "\tat offset 0x%x failed (%s)\n", + "\tat offset 0x%lx failed (%s)\n", key, offset, strerror(errno)); return FALSE; } @@ -332,8 +332,8 @@ xf86EnableAGP(int screenNum, CARD32 mode) setup.agp_mode = mode; if (ioctl(gartFd, AGPIOC_SETUP, &setup) != 0) { xf86DrvMsg(screenNum, X_WARNING, "xf86EnableAGP: " - "AGPIOC_SETUP with mode %d failed (%s)\n", - mode, strerror(errno)); + "AGPIOC_SETUP with mode %ld failed (%s)\n", + (unsigned long)mode, strerror(errno)); return FALSE; } |