Cards with revision < 10 (qemu rev is 0), have no ad1848 chip and

don't attach the ad1848 driver. But the "malloc" method of gus_hw_if
is ad1848_malloc() which assumes a ad1848 is attached (and expect the
softc pointer to be a struct ad1848_softc, but get a gus_softc pointer
instead). Implement, the missing gus_{malloc,free,mappage,...}
routines. Add the missing mtx_{enter,leave} calls, as we're at it.
Found by mlarkin.

ok mlarkin

1 files changed, 5 insertions, 1 deletions

diff --git a/sys/dev/isa/gusvar.h b/sys/dev/isa/gusvar.h
index 3dc11ebd0f3..eb28efac411 100644
--- a/sys/dev/isa/gusvar.h
+++ b/sys/dev/isa/gusvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gusvar.h,v 1.7 2008/11/21 16:06:36 robert Exp $	*/
+/*	$OpenBSD: gusvar.h,v 1.8 2015/06/25 20:05:11 ratchov Exp $	*/
 /*	$NetBSD: gus.c,v 1.51 1998/01/25 23:48:06 mycroft Exp $	*/
 
 /*-
@@ -370,6 +370,10 @@ int	gusmax_mixer_get_port(void *, mixer_ctrl_t *);
 int	gus_mixer_query_devinfo(void *, mixer_devinfo_t *);
 int	gusmax_mixer_query_devinfo(void *, mixer_devinfo_t *);
 int	gus_query_encoding(void *, struct audio_encoding *);
+void   *gus_malloc(void *, int, size_t, int, int);
+void	gus_free(void *, void *, int);
+size_t	gus_round(void *, int, size_t);
+paddr_t	gus_mappage(void *, void *, off_t, int);
 int	gus_get_props(void *);
 int	gusmax_get_props(void *);