d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Const'ify the bus_stream_asi and bus_type_asi arrays.

Browse Source 
- Replace hard-coded functions names missed in bus_machdep.c rev. 1.44
  with __func__.
- Break some long lines.

MFC after:	1 month
This commit is contained in:
Marius Strobl 2008-03-24 17:57:01 +00:00
parent 23a6342bb7
commit 5259569262
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/sparc64/include/bus.h
View File

@ -96,8 +96,8 @@
#define PCI_MEMORY_BUS_SPACE 4
#define LAST_BUS_SPACE 5
extern int bus_type_asi[];
extern int bus_stream_asi[];
extern const int bus_type_asi[];
extern const int bus_stream_asi[];
#define __BUS_SPACE_HAS_STREAM_METHODS 1

23
sys/sparc64/sparc64/bus_machdep.c
View File

@ -95,7 +95,7 @@
* from: @(#)machdep.c 8.6 (Berkeley) 1/14/94
* from: NetBSD: machdep.c,v 1.111 2001/09/15 07:13:40 eeh Exp
* and
* from: FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.24 2001/08/15
* from: FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.24 2001/08/15
*/
#include <sys/cdefs.h>
@ -130,8 +130,8 @@ __FBSDID("$FreeBSD$");
static void nexus_bus_barrier(bus_space_tag_t, bus_space_handle_t,
bus_size_t, bus_size_t, int);
/* ASI's for bus access. */
int bus_type_asi[] = {
/* ASIs for bus access */
const int bus_type_asi[] = {
ASI_PHYS_BYPASS_EC_WITH_EBIT, /* nexus */
ASI_PHYS_BYPASS_EC_WITH_EBIT, /* SBus */
ASI_PHYS_BYPASS_EC_WITH_EBIT_L, /* PCI configuration space */
@ -140,7 +140,7 @@ int bus_type_asi[] = {
0
};
int bus_stream_asi[] = {
const int bus_stream_asi[] = {
ASI_PHYS_BYPASS_EC_WITH_EBIT, /* nexus */
ASI_PHYS_BYPASS_EC_WITH_EBIT, /* SBus */
ASI_PHYS_BYPASS_EC_WITH_EBIT, /* PCI configuration space */
@ -244,7 +244,7 @@ bus_dma_tag_create(bus_dma_tag_t parent, bus_size_t alignment,
newtag->dt_segments = NULL;
/* Take into account any restrictions imposed by our parent tag */
/* Take into account any restrictions imposed by our parent tag. */
newtag->dt_lowaddr = ulmin(parent->dt_lowaddr, newtag->dt_lowaddr);
newtag->dt_highaddr = ulmax(parent->dt_highaddr, newtag->dt_highaddr);
if (newtag->dt_boundary == 0)
@ -542,8 +542,7 @@ nexus_dmamap_load_uio(bus_dma_tag_t dmat, bus_dmamap_t map, struct uio *uio,
if (uio->uio_segflg == UIO_USERSPACE) {
td = uio->uio_td;
KASSERT(td != NULL,
("nexus_dmamap_load_uio: USERSPACE but no proc"));
KASSERT(td != NULL, ("%s: USERSPACE but no proc", __func__));
}
nsegs = 0;
@ -643,9 +642,9 @@ nexus_dmamem_alloc(bus_dma_tag_t dmat, void **vaddr, int flags,
*vaddr = malloc(dmat->dt_maxsize, M_DEVBUF, mflags);
} else {
/*
* XXX: Use contigmalloc until it is merged into this facility
* and handles multi-seg allocations. Nobody is doing multi-seg
* allocations yet though.
* XXX use contigmalloc until it is merged into this
* facility and handles multi-seg allocations. Nobody
* is doing multi-seg allocations yet though.
*/
*vaddr = contigmalloc(dmat->dt_maxsize, M_DEVBUF, mflags,
0ul, dmat->dt_lowaddr,
@ -782,8 +781,8 @@ sparc64_bus_mem_unmap(void *bh, bus_size_t size)
}
/*
* Fake up a bus tag, for use by console drivers in early boot when the regular
* means to allocate resources are not yet available.
* Fake up a bus tag, for use by console drivers in early boot when the
* regular means to allocate resources are not yet available.
* Addr is the physical address of the desired start of the handle.
*/
bus_space_handle_t