diff options
| author |   ericj <ericj@openbsd.org> | 2002-01-20 19:56:53 +0000 |
|---|---|---|
| committer | ericj <ericj@openbsd.org> | 2002-01-20 19:56:53 +0000 |
| commit | 55800f2ea0f594a22b70f969ae13c7d05cf21a3f (patch) | |
| tree | 77d3cbe3f298d0ddf3d62ded00e47b7ceffa561a /sys/dev/pci/cmpci.c | |
| parent | Swap TEST_BLOCK_LEN and TEST_BLOCK_COUNT in benchmark printf. (diff) | |
| download | wireguard-openbsd-55800f2ea0f594a22b70f969ae13c7d05cf21a3f.tar.xz wireguard-openbsd-55800f2ea0f594a22b70f969ae13c7d05cf21a3f.zip | |
make all audio drivers use the new allocm and round_buffersize decl's.
will ease porting, and generally cleans up a bit
Diffstat (limited to 'sys/dev/pci/cmpci.c')
| -rw-r--r-- | sys/dev/pci/cmpci.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/sys/dev/pci/cmpci.c b/sys/dev/pci/cmpci.c index 424685dc0bb..16a7c3b7f3e 100644 --- a/sys/dev/pci/cmpci.c +++ b/sys/dev/pci/cmpci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cmpci.c,v 1.5 2001/10/31 11:00:24 art Exp $ */ +/* $OpenBSD: cmpci.c,v 1.6 2002/01/20 19:56:53 ericj Exp $ */ /* * Copyright (c) 2000 Takuya SHIOZAKI @@ -137,9 +137,9 @@ int cmpci_getdev __P((void *, struct audio_device *)); int cmpci_set_port __P((void *, mixer_ctrl_t *)); int cmpci_get_port __P((void *, mixer_ctrl_t *)); int cmpci_query_devinfo __P((void *, mixer_devinfo_t *)); -void *cmpci_malloc __P((void *, u_long, int, int)); +void *cmpci_malloc __P((void *, int, size_t, int, int)); void cmpci_free __P((void *, void *, int)); -u_long cmpci_round_buffersize __P((void *, u_long)); +size_t cmpci_round_buffersize __P((void *, int, size_t)); paddr_t cmpci_mappage __P((void *, void *, off_t, int)); int cmpci_get_props __P((void *)); int cmpci_trigger_output __P((void *, void *, void *, int, @@ -1115,9 +1115,10 @@ cmpci_print_dmamem(p) #endif /* DEBUG */ void * -cmpci_malloc(handle, size, type, flags) +cmpci_malloc(handle, direction, size, type, flags) void *handle; - u_long size; + int direction; + size_t size; int type, flags; { struct cmpci_softc *sc = handle; @@ -1453,10 +1454,11 @@ cmpci_get_port(handle, cp) } /* ARGSUSED */ -u_long -cmpci_round_buffersize(handle, bufsize) +size_t +cmpci_round_buffersize(handle, direction, bufsize) void *handle; - u_long bufsize; + int direction; + size_t bufsize; { if (bufsize > 0x10000) bufsize = 0x10000; |