Fix AGP debugging code:

- correct format strings
- fill opt_agp.h if AGP_DEBUG is defined
- bring AGP_DEBUG to LINT by mentioning it in NOTES

This should hopefully fix a warning that was...

Found by:	Coverity Prevent(tm)
CID:		3676
Tested on:	amd64, i386
This commit is contained in:
Wojciech A. Koszek 2009-02-06 20:57:10 +00:00
parent 61e69c80e4
commit c353491ad3
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=188247
7 changed files with 22 additions and 3 deletions

View File

@ -150,6 +150,11 @@ device pci
# AGP GART support
device agp
#
# AGP debugging.
#
options AGP_DEBUG
#####################################################################
# HARDWARE DEVICE CONFIGURATION

View File

@ -37,6 +37,9 @@ VGA_NO_MODE_CHANGE opt_vga.h
VGA_SLOW_IOACCESS opt_vga.h
VGA_WIDTH90 opt_vga.h
# AGP debugging support
AGP_DEBUG opt_agp.h
ATKBD_DFLT_KEYMAP opt_atkbd.h
# -------------------------------

View File

@ -88,6 +88,9 @@ VGA_WIDTH90 opt_vga.h
VESA
VESA_DEBUG opt_vesa.h
# AGP debugging support
AGP_DEBUG opt_agp.h
PSM_DEBUG opt_psm.h
PSM_HOOKRESUME opt_psm.h
PSM_RESETAFTERSUSPEND opt_psm.h

View File

@ -96,6 +96,7 @@ DEV_NPX opt_npx.h
# Debugging
NPX_DEBUG opt_npx.h
STOP_NMI opt_cpu.h
AGP_DEBUG opt_agp.h
# BPF just-in-time compiler
BPF_JITTER opt_bpf.h

View File

@ -27,6 +27,7 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#include "opt_agp.h"
#include "opt_bus.h"
#include <sys/param.h>
@ -554,7 +555,7 @@ agp_generic_bind_memory(device_t dev, struct agp_memory *mem,
*/
m = vm_page_grab(mem->am_obj, OFF_TO_IDX(i),
VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY);
AGP_DPF("found page pa=%#x\n", VM_PAGE_TO_PHYS(m));
AGP_DPF("found page pa=%#jx\n", (uintmax_t)VM_PAGE_TO_PHYS(m));
}
VM_OBJECT_UNLOCK(mem->am_obj);
@ -585,8 +586,8 @@ agp_generic_bind_memory(device_t dev, struct agp_memory *mem,
for (j = 0; j < PAGE_SIZE && i + j < mem->am_size;
j += AGP_PAGE_SIZE) {
vm_offset_t pa = VM_PAGE_TO_PHYS(m) + j;
AGP_DPF("binding offset %#x to pa %#x\n",
offset + i + j, pa);
AGP_DPF("binding offset %#jx to pa %#jx\n",
(uintmax_t)offset + i + j, (uintmax_t)pa);
error = AGP_BIND_PAGE(dev, offset + i + j, pa);
if (error) {
/*

View File

@ -347,6 +347,9 @@ device pci
# AGP GART support
device agp
# AGP debugging.
options AGP_DEBUG
#####################################################################
# HARDWARE DEVICE CONFIGURATION

View File

@ -288,6 +288,9 @@ device pci
# AGP GART support
device agp
# AGP debugging.
options AGP_DEBUG
#####################################################################
# HARDWARE DEVICE CONFIGURATION