X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/blobdiff_plain/2eac5088e599e934d662540f19100b8dead0efec..b13267a5123f6a14e47d788c4a8a2a8692e2a119:/sys/dev/video/fb/vga.c

diff --git a/sys/dev/video/fb/vga.c b/sys/dev/video/fb/vga.c
index 84fbb64ad6..e40fd369f3 100644
--- a/sys/dev/video/fb/vga.c
+++ b/sys/dev/video/fb/vga.c
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/dev/fb/vga.c,v 1.9.2.1 2001/08/11 02:58:44 yokota Exp $
- * $DragonFly: src/sys/dev/video/fb/vga.c,v 1.15 2005/10/30 23:00:56 swildner Exp $
+ * $DragonFly: src/sys/dev/video/fb/vga.c,v 1.18 2006/09/10 01:26:37 dillon Exp $
  */
 
 #include "opt_vga.h"
@@ -96,44 +96,46 @@ vga_attach_unit(int unit, vga_softc_t *sc, int flags)
 
 #ifdef FB_INSTALL_CDEV
 
+struct ucred;
+
 int
-vga_open(dev_t dev, vga_softc_t *sc, int flag, int mode, struct thread *td)
+vga_open(cdev_t dev, vga_softc_t *sc, int flag, int mode, struct ucred *cred)
 {
 	if (sc == NULL)
 		return ENXIO;
 	if (mode & (O_CREAT | O_APPEND | O_TRUNC))
 		return ENODEV;
 
-	return genfbopen(&sc->gensc, sc->adp, flag, mode, td);
+	return genfbopen(&sc->gensc, sc->adp, flag, mode, cred);
 }
 
 int
-vga_close(dev_t dev, vga_softc_t *sc, int flag, int mode, struct thread *td)
+vga_close(cdev_t dev, vga_softc_t *sc, int flag, int mode)
 {
-	return genfbclose(&sc->gensc, sc->adp, flag, mode, td);
+	return genfbclose(&sc->gensc, sc->adp, flag, mode);
 }
 
 int
-vga_read(dev_t dev, vga_softc_t *sc, struct uio *uio, int flag)
+vga_read(cdev_t dev, vga_softc_t *sc, struct uio *uio, int flag)
 {
 	return genfbread(&sc->gensc, sc->adp, uio, flag);
 }
 
 int
-vga_write(dev_t dev, vga_softc_t *sc, struct uio *uio, int flag)
+vga_write(cdev_t dev, vga_softc_t *sc, struct uio *uio, int flag)
 {
 	return genfbread(&sc->gensc, sc->adp, uio, flag);
 }
 
 int
-vga_ioctl(dev_t dev, vga_softc_t *sc, u_long cmd, caddr_t arg, int flag,
-	  struct thread *td)
+vga_ioctl(cdev_t dev, vga_softc_t *sc, u_long cmd, caddr_t arg, int flag,
+	  struct ucred *cred)
 {
-	return genfbioctl(&sc->gensc, sc->adp, cmd, arg, flag, td);
+	return genfbioctl(&sc->gensc, sc->adp, cmd, arg, flag, cred);
 }
 
 int
-vga_mmap(dev_t dev, vga_softc_t *sc, vm_offset_t offset, int prot)
+vga_mmap(cdev_t dev, vga_softc_t *sc, vm_offset_t offset, int prot)
 {
 	return genfbmmap(&sc->gensc, sc->adp, offset, prot);
 }
@@ -2824,11 +2826,11 @@ get_palette(video_adapter_t *adp, int base, int count,
 	base + count > 256)
 	return EINVAL;
 
-    r = malloc(count*3, M_DEVBUF, M_WAITOK);
+    r = kmalloc(count*3, M_DEVBUF, M_WAITOK);
     g = r + count;
     b = g + count;
     if (vga_save_palette2(adp, base, count, r, g, b)) {
-	free(r, M_DEVBUF);
+	kfree(r, M_DEVBUF);
 	return ENODEV;
     }
     copyout(r, red, count);
@@ -2838,7 +2840,7 @@ get_palette(video_adapter_t *adp, int base, int count,
 	bzero(r, count);
 	copyout(r, trans, count);
     }
-    free(r, M_DEVBUF);
+    kfree(r, M_DEVBUF);
 
     return 0;
 }
@@ -2856,7 +2858,7 @@ set_palette(video_adapter_t *adp, int base, int count,
 	base + count > 256)
 	return EINVAL;
 
-    r = malloc(count*3, M_DEVBUF, M_WAITOK);
+    r = kmalloc(count*3, M_DEVBUF, M_WAITOK);
     g = r + count;
     b = g + count;
     err = copyin(red, r, count);
@@ -2866,7 +2868,7 @@ set_palette(video_adapter_t *adp, int base, int count,
 	err = copyin(blue, b, count);
     if (!err)
 	err = vga_load_palette2(adp, base, count, r, g, b);
-    free(r, M_DEVBUF);
+    kfree(r, M_DEVBUF);
 
     return (err ? ENODEV : 0);
 }