[src/netbsd-1-6]: src/sys/sys Pull up revision 1.2 (requested by tron in tick...

[grant <grant%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8a36641e4450
branches:  netbsd-1-6
changeset: 530275:8a36641e4450
user:      grant <grant%NetBSD.org@localhost>
date:      Mon Jun 16 12:50:36 2003 +0000

description:
Pull up revision 1.2 (requested by tron in ticket #1182):

>From FreeBSD: Fix an off-by-bit error in the AGP_MODE_[GS]ET_RATE() macros.

This fixes PR kern/20480 by Quentin Garnier.

diffstat:

 sys/sys/agpio.h |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r d483065ce33a -r 8a36641e4450 sys/sys/agpio.h
--- a/sys/sys/agpio.h   Mon Jun 16 12:49:41 2003 +0000
+++ b/sys/sys/agpio.h   Mon Jun 16 12:50:36 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: agpio.h,v 1.1 2001/09/10 10:01:00 fvdl Exp $   */
+/*     $NetBSD: agpio.h,v 1.1.18.1 2003/06/16 12:50:36 grant Exp $     */
 
 /*-
  * Copyright (c) 2000 Doug Rabson
@@ -45,13 +45,13 @@
 #define AGP_MODE_GET_AGP(x)            (((x) & 0x00000100U) >> 8)
 #define AGP_MODE_GET_4G(x)             (((x) & 0x00000020U) >> 5)
 #define AGP_MODE_GET_FW(x)             (((x) & 0x00000010U) >> 4)
-#define AGP_MODE_GET_RATE(x)           ((x) & 0x00000003U)
+#define AGP_MODE_GET_RATE(x)           ((x) & 0x00000007U)
 #define AGP_MODE_SET_RQ(x,v)           (((x) & ~0xff000000U) | ((v) << 24))
 #define AGP_MODE_SET_SBA(x,v)          (((x) & ~0x00000200U) | ((v) << 9))
 #define AGP_MODE_SET_AGP(x,v)          (((x) & ~0x00000100U) | ((v) << 8))
 #define AGP_MODE_SET_4G(x,v)           (((x) & ~0x00000020U) | ((v) << 5))
 #define AGP_MODE_SET_FW(x,v)           (((x) & ~0x00000010U) | ((v) << 4))
-#define AGP_MODE_SET_RATE(x,v)         (((x) & ~0x00000003U) | (v))
+#define AGP_MODE_SET_RATE(x,v)         (((x) & ~0x00000007U) | (v))
 #define AGP_MODE_RATE_1x               0x00000001
 #define AGP_MODE_RATE_2x               0x00000002
 #define AGP_MODE_RATE_4x               0x00000004