From owner-p4-projects@FreeBSD.ORG  Sun Apr  2 06:21:02 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6A58816A420; Sun,  2 Apr 2006 06:21:02 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2CEDE16A401
	for <perforce@freebsd.org>; Sun,  2 Apr 2006 06:21:02 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id EEF3543D45
	for <perforce@freebsd.org>; Sun,  2 Apr 2006 06:21:01 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k326L1wj013744
	for <perforce@freebsd.org>; Sun, 2 Apr 2006 06:21:01 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k326L1wf013741
	for perforce@freebsd.org; Sun, 2 Apr 2006 06:21:01 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sun, 2 Apr 2006 06:21:01 GMT
Message-Id: <200604020621.k326L1wf013741@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 94448 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 02 Apr 2006 06:21:02 -0000

http://perforce.freebsd.org/chv.cgi?CH=94448

Change 94448 by kmacy@kmacy_storage:sun4v_work on 2006/04/02 06:20:04

	update hvio_config_* functions

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#8 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/include/hypervisor_api.h#8 (text+ko) ====

@@ -40,7 +40,21 @@
 
 typedef uint64_t devhandle_t;
 
+typedef uint32_t pci_config_offset_t;
+
+typedef enum pci_config_size {
+	PCI_CFG_SIZE_BYTE = 0,
+	PCI_CFG_SIZE_WORD,
+	PCI_CFG_SIZE_DWORD
+} pci_config_size_t;
 
+typedef union pci_cfg_data {
+	uint8_t b;
+	uint16_t w;
+	uint32_t dw;
+	uint64_t qw;
+} pci_cfg_data_t;
+
 extern uint64_t hv_mmu_map_perm_addr(void *, int, uint64_t, int);
 extern uint64_t	hv_mmu_unmap_perm_addr(void *, int, int);
 extern uint64_t	hv_set_ctx0(uint64_t, uint64_t);
@@ -95,9 +109,10 @@
 extern uint64_t hvio_peek(devhandle_t dev_hdl, uint64_t r_addr, uint64_t size,
 			  uint64_t *err_flag, uint64_t *data);
 extern uint64_t hvio_config_get(devhandle_t dev_hdl, uint64_t pci_device, 
-				uint64_t r_addr, uint64_t size, uint32_t *data);
+				uint64_t r_addr, pci_config_size_t size, pci_cfg_data_t *data);
 extern uint64_t hvio_config_put(devhandle_t dev_hdl, uint64_t pci_device, 
-				uint64_t r_addr, uint64_t size, uint32_t data, uint32_t err_flags);
+				pci_config_offset_t off, pci_config_size_t size, 
+				pci_cfg_data_t data, uint32_t *err_flags);
 
 extern void hv_magic_trap_on(void);
 extern void hv_magic_trap_off(void);