From bf8de77465e3cbfcc9188c263080e9dc29a89f19 Mon Sep 17 00:00:00 2001 From: Lisa Hsu Date: Wed, 21 Apr 2004 18:23:41 -0400 Subject: This is where I'm at for Linux Ethernet before I head to Mexico. base/range.hh: andrew thought this might be a bug. dev/etherpkt.cc: don't need std:: since there is a using directive dev/ns_gige.cc: update to new PIO and PCI system dev/ns_gige.hh: update to deal with new PIO and PCI setup dev/ns_gige_reg.h: Add some new #defines that I ended up needing dev/pcidev.cc: some changes to the debugging printfs of pci device --HG-- extra : convert_revision : 955ba8e8e1c418cfe1c6549dc3451ea091541556 --- dev/pcidev.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'dev/pcidev.cc') diff --git a/dev/pcidev.cc b/dev/pcidev.cc index 4852fc581..9ac170b5c 100644 --- a/dev/pcidev.cc +++ b/dev/pcidev.cc @@ -77,24 +77,24 @@ PciDev::ReadConfig(int offset, int size, uint8_t *data) case sizeof(uint32_t): memcpy((uint32_t*)data, config.data + offset, sizeof(uint32_t)); DPRINTF(PCIDEV, - "read device: %#x function: %#x register: %#x data: %#x\n", - deviceNum, functionNum, offset, + "read device: %#x function: %#x register: %#x %d bytes: data: %#x\n", + deviceNum, functionNum, offset, size, *(uint32_t*)(config.data + offset)); break; case sizeof(uint16_t): memcpy((uint16_t*)data, config.data + offset, sizeof(uint16_t)); DPRINTF(PCIDEV, - "read device: %#x function: %#x register: %#x data: %#x\n", - deviceNum, functionNum, offset, + "read device: %#x function: %#x register: %#x %d bytes: data: %#x\n", + deviceNum, functionNum, offset, size, *(uint16_t*)(config.data + offset)); break; case sizeof(uint8_t): memcpy((uint8_t*)data, config.data + offset, sizeof(uint8_t)); DPRINTF(PCIDEV, - "read device: %#x function: %#x register: %#x data: %#x\n", - deviceNum, functionNum, offset, + "read device: %#x function: %#x register: %#x %d bytes: data: %#x\n", + deviceNum, functionNum, offset, size, (uint16_t)(*(uint8_t*)(config.data + offset))); break; @@ -116,7 +116,7 @@ PciDev::WriteConfig(int offset, int size, uint32_t data) word_value = data; DPRINTF(PCIDEV, - "write device: %#x function: %#x reg: %#x size: %#x data: %#x\n", + "write device: %#x function: %#x reg: %#x size: %d data: %#x\n", deviceNum, functionNum, offset, size, word_value); barnum = (offset - PCI0_BASE_ADDR0) >> 2; -- cgit v1.2.3