Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/x68k/dev Change the `name' argument of dmac_alloc_c...



details:   https://anonhg.NetBSD.org/src/rev/ca0acabab53b
branches:  trunk
changeset: 581985:ca0acabab53b
user:      he <he%NetBSD.org@localhost>
date:      Sun Jun 12 23:42:54 2005 +0000

description:
Change the `name' argument of dmac_alloc_channel to const char*, so that
a string constant can be used without generating a warning.

diffstat:

 sys/arch/x68k/dev/dmacvar.h    |  4 ++--
 sys/arch/x68k/dev/intio_dmac.c |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r a32cda2623db -r ca0acabab53b sys/arch/x68k/dev/dmacvar.h
--- a/sys/arch/x68k/dev/dmacvar.h       Sun Jun 12 21:38:12 2005 +0000
+++ b/sys/arch/x68k/dev/dmacvar.h       Sun Jun 12 23:42:54 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: dmacvar.h,v 1.5 2005/01/18 07:12:15 chs Exp $  */
+/*     $NetBSD: dmacvar.h,v 1.6 2005/06/12 23:42:54 he Exp $   */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -106,7 +106,7 @@
 #define DMAC_MAXSEGSZ  0xff00
 #define DMAC_BOUNDARY  0
 
-struct dmac_channel_stat *dmac_alloc_channel(struct device *, int, char *,
+struct dmac_channel_stat *dmac_alloc_channel(struct device *, int, const char *,
        int, dmac_intr_handler_t, void *, int, dmac_intr_handler_t, void *);
                /* ch, name, normalv, normal, errorv, error */
 int dmac_free_channel(struct device *, int, void *);
diff -r a32cda2623db -r ca0acabab53b sys/arch/x68k/dev/intio_dmac.c
--- a/sys/arch/x68k/dev/intio_dmac.c    Sun Jun 12 21:38:12 2005 +0000
+++ b/sys/arch/x68k/dev/intio_dmac.c    Sun Jun 12 23:42:54 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intio_dmac.c,v 1.21 2005/01/18 07:12:15 chs Exp $      */
+/*     $NetBSD: intio_dmac.c,v 1.22 2005/06/12 23:42:54 he Exp $       */
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intio_dmac.c,v 1.21 2005/01/18 07:12:15 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intio_dmac.c,v 1.22 2005/06/12 23:42:54 he Exp $");
 
 #include "opt_m680x0.h"
 
@@ -162,7 +162,7 @@
  * Channel initialization/deinitialization per user device.
  */
 struct dmac_channel_stat *
-dmac_alloc_channel(struct device *self, int ch, char *name, int normalv,
+dmac_alloc_channel(struct device *self, int ch, const char *name, int normalv,
     dmac_intr_handler_t normal, void *normalarg, int errorv,
     dmac_intr_handler_t error, void *errorarg)
 {



Home | Main Index | Thread Index | Old Index