agp(4): Fix some minor issues.

* Move AGP_DEBUG to the global 'options' file. No need to split it by
  platform.

* Add missing file to the Makefile.

* Fix a cast.

diff --git a/sys/conf/options b/sys/conf/options
index 210ec94..eec3733 100644 (file)
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -418,6 +418,9 @@ NETGRAPH_TTY                opt_netgraph.h
 NETGRAPH_UI            opt_netgraph.h
 NETGRAPH_VJC           opt_netgraph.h
 
+# AGP options
+AGP_DEBUG              opt_agp.h
+
 # DRM options
 DRM_DEBUG              opt_drm.h
 DRM_LINUX              opt_drm.h

diff --git a/sys/dev/agp/Makefile b/sys/dev/agp/Makefile
index a388252..8b6c6fc 100644 (file)
--- a/sys/dev/agp/Makefile
+++ b/sys/dev/agp/Makefile
@@ -5,6 +5,8 @@ SRCS    = agp.c
 SRCS   += agp_i810.c agp_ali.c agp_amd.c agp_amd64.c agp_ati.c agp_nvidia.c
 SRCS   += agp_intel.c agp_sis.c agp_via.c
 SRCS   += agp_if.c device_if.h bus_if.h agp_if.h pci_if.h
+SRCS   += opt_agp.h
+
 MFILES = kern/device_if.m kern/bus_if.m dev/agp/agp_if.m bus/pci/pci_if.m
 
 .include <bsd.kmod.mk>

diff --git a/sys/dev/agp/agp_i810.c b/sys/dev/agp/agp_i810.c
index 9e544e2..70e5516 100644 (file)
--- a/sys/dev/agp/agp_i810.c
+++ b/sys/dev/agp/agp_i810.c
@@ -860,7 +860,7 @@ agp_i810_bind_page(device_t dev, vm_offset_t offset, vm_offset_t physical)
        struct agp_i810_softc *sc = device_get_softc(dev);
 
        if (offset >= (sc->gatt->ag_entries << AGP_PAGE_SHIFT)) {
-               device_printf(dev, "failed: offset is 0x%08jx, shift is %d, entries is %d\n", (intmax_t)offset, AGP_PAGE_SHIFT, sc->gatt->ag_entries);
+               device_printf(dev, "failed: offset is 0x%08jx, shift is %d, entries is %d\n", (uintmax_t)offset, AGP_PAGE_SHIFT, sc->gatt->ag_entries);
                return EINVAL;
        }
 

diff --git a/sys/platform/pc32/conf/options b/sys/platform/pc32/conf/options
index 079d54d..63533bd 100644 (file)
--- a/sys/platform/pc32/conf/options
+++ b/sys/platform/pc32/conf/options
@@ -101,9 +101,6 @@ PSM_HOOKRESUME              opt_psm.h
 PSM_RESETAFTERSUSPEND  opt_psm.h
 PSM_DEBUG              opt_psm.h
 
-# AGP debugging support
-AGP_DEBUG              opt_agp.h
-
 ATKBD_DFLT_KEYMAP      opt_atkbd.h
 
 KBD_DISABLE_KEYMAP_LOAD        opt_kbd.h

diff --git a/sys/platform/pc64/conf/options b/sys/platform/pc64/conf/options
index 8920a95..b149a4e 100644 (file)
--- a/sys/platform/pc64/conf/options
+++ b/sys/platform/pc64/conf/options
@@ -52,10 +52,6 @@ PSM_HOOKRESUME               opt_psm.h
 PSM_RESETAFTERSUSPEND  opt_psm.h
 PSM_DEBUG              opt_psm.h
 
-
-# AGP debugging support
-AGP_DEBUG              opt_agp.h
-
 ATKBD_DFLT_KEYMAP      opt_atkbd.h
 
 KBD_DISABLE_KEYMAP_LOAD        opt_kbd.h