Module Name: src Committed By: snj Date: Thu Dec 2 23:42:37 UTC 2010
Modified Files: src/sys/dev/ic [netbsd-5]: iavc.c Log Message: Pull up following revision(s) (requested by riz in ticket #1418): sys/dev/ic/iavc.c: revision 1.8 Make this compile &foo[0] does not work for void * :-) Wojciech Galazka To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.14.1 src/sys/dev/ic/iavc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/dev/ic/iavc.c diff -u src/sys/dev/ic/iavc.c:1.7 src/sys/dev/ic/iavc.c:1.7.14.1 --- src/sys/dev/ic/iavc.c:1.7 Tue Apr 8 12:07:26 2008 +++ src/sys/dev/ic/iavc.c Thu Dec 2 23:42:37 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: iavc.c,v 1.7 2008/04/08 12:07:26 cegger Exp $ */ +/* $NetBSD: iavc.c,v 1.7.14.1 2010/12/02 23:42:37 snj Exp $ */ /* * Copyright (c) 2001-2003 Cubical Solutions Ltd. All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iavc.c,v 1.7 2008/04/08 12:07:26 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iavc.c,v 1.7.14.1 2010/12/02 23:42:37 snj Exp $"); #include <sys/param.h> #include <sys/kernel.h> @@ -892,7 +892,7 @@ u_int8_t *dmabuf = 0, cmd; if (sc->sc_dma) { - dmabuf = amcc_get_byte(&sc->sc_recvbuf[0], &cmd); + dmabuf = amcc_get_byte(sc->sc_recvbuf, &cmd); } else { cmd = iavc_get_byte(sc); } @@ -1004,9 +1004,9 @@ /* Copy message to DMA buffer. */ if (m->m_next) - dmabuf = amcc_put_byte(&sc->sc_sendbuf[0], SEND_DATA_B3_REQ); + dmabuf = amcc_put_byte(sc->sc_sendbuf, SEND_DATA_B3_REQ); else - dmabuf = amcc_put_byte(&sc->sc_sendbuf[0], SEND_MESSAGE); + dmabuf = amcc_put_byte(sc->sc_sendbuf, SEND_MESSAGE); dmabuf = amcc_put_word(dmabuf, m->m_len); memcpy(dmabuf, m->m_data, m->m_len); @@ -1061,7 +1061,7 @@ uint8_t *dmabuf; if (sc->sc_dma) { - memcpy(&sc->sc_sendbuf[0], m->m_data + 2, m->m_len - 2); + memcpy(sc->sc_sendbuf, m->m_data + 2, m->m_len - 2); txlen = m->m_len - 2; } else {