diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/de/if_de.c | 4 | ||||
| -rw-r--r-- | sys/dev/fxp/if_fxp.c | 4 | ||||
| -rw-r--r-- | sys/dev/syscons/syscons.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c index 1d1de89..f6d120d 100644 --- a/sys/dev/de/if_de.c +++ b/sys/dev/de/if_de.c @@ -1,5 +1,5 @@ /* $NetBSD: if_de.c,v 1.80 1998/09/25 18:06:53 matt Exp $ */ -/* $Id: if_de.c,v 1.94 1999/01/27 23:45:41 dillon Exp $ */ +/* $Id: if_de.c,v 1.95 1999/01/28 00:57:52 dillon Exp $ */ /*- * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com) @@ -2412,7 +2412,7 @@ tulip_srom_decode( /* * Save the hardware address. */ - bcopy((v_caddr_t) shp->sh_ieee802_address, (v_caddr_t) sc->tulip_enaddr, 6); + bcopy((c_caddr_t) shp->sh_ieee802_address, (v_caddr_t) sc->tulip_enaddr, 6); /* * If this is a multiple port card, add the adapter index to the last * byte of the hardware address. (if it isn't multiport, adding 0 diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c index 83deb25..6fd0666 100644 --- a/sys/dev/fxp/if_fxp.c +++ b/sys/dev/fxp/if_fxp.c @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_fxp.c,v 1.60 1999/01/27 23:45:42 dillon Exp $ + * $Id: if_fxp.c,v 1.61 1999/01/28 00:57:53 dillon Exp $ */ /* @@ -1290,7 +1290,7 @@ fxp_init(xsc) * zero and must be one bits in this structure and this is the easiest * way to initialize them all to proper values. */ - bcopy(fxp_cb_config_template, (void *)&cbp->cb_status, + bcopy(fxp_cb_config_template, (volatile void *)&cbp->cb_status, sizeof(fxp_cb_config_template)); cbp->cb_status = 0; diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c index e269df0..18d376c 100644 --- a/sys/dev/syscons/syscons.c +++ b/sys/dev/syscons/syscons.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: syscons.c,v 1.294 1999/01/26 09:58:37 yokota Exp $ + * $Id: syscons.c,v 1.295 1999/01/28 01:59:48 dillon Exp $ */ #include "sc.h" @@ -172,7 +172,9 @@ static long scrn_time_stamp; static int saver_mode = CONS_LKM_SAVER; /* LKM/user saver */ static int run_scrn_saver = FALSE; /* should run the saver? */ static int scrn_idle = FALSE; /* about to run the saver */ +#if NSPLASH > 0 static int scrn_saver_failed; +#endif u_char scr_map[256]; u_char scr_rmap[256]; static int initial_video_mode; /* initial video mode # */ |
