Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change IPL_LEVELS to NIPL. 

current_spl_level is dead.
This commit is contained in:
matt 2008-04-29 17:09:47 +00:00
parent b872c0e53d
commit 00caca484f
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/acorn32/acorn32/genassym.cf
View File

@ -1,4 +1,4 @@
# $NetBSD: genassym.cf,v 1.3 2002/10/05 23:30:03 bjh21 Exp $
# $NetBSD: genassym.cf,v 1.4 2008/04/29 17:09:47 matt Exp $
# Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved.
@ -37,6 +37,8 @@
include <machine/intr.h>
include <arch/acorn32/acorn32/hydravar.h>
define NIPL NIPL
define IH_FUNC offsetof(struct irqhandler, ih_func)
define IH_ARG offsetof(struct irqhandler, ih_arg)
define IH_FLAGS offsetof(struct irqhandler, ih_flags)

4
sys/arch/acorn32/include/irqhandler.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: irqhandler.h,v 1.7 2005/12/11 12:16:05 christos Exp $ */
/* $NetBSD: irqhandler.h,v 1.8 2008/04/29 17:09:47 matt Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@ -196,7 +196,7 @@ typedef struct irqhandler {
} irqhandler_t;
#ifdef _KERNEL
extern u_int irqmasks[IPL_LEVELS];
extern u_int irqmasks[NIPL];
extern irqhandler_t *irqhandlers[NIRQS];
void irq_init __P((void));

10
sys/arch/arm/iomd/vidcvideo.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vidcvideo.c,v 1.34 2008/02/29 00:37:26 chris Exp $ */
/* $NetBSD: vidcvideo.c,v 1.35 2008/04/29 17:09:47 matt Exp $ */
/*
* Copyright (c) 2001 Reinoud Zandijk
@ -36,7 +36,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.34 2008/02/29 00:37:26 chris Exp $");
__KERNEL_RCSID(0, "$NetBSD: vidcvideo.c,v 1.35 2008/04/29 17:09:47 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -585,7 +585,7 @@ static void vidcvideo_queue_dc_change(struct fb_devconfig *dc, int dc_change)
{
dc->_internal_dc_changed |= dc_change;
if (current_spl_level == _SPL_HIGH) {
if (curcpl() == IPL_HIGH) {
/* running in ddb or without interrupts */
dc->dc_writeback_delay = 1;
flush_dc_changes_to_screen(dc);
@ -601,7 +601,7 @@ static void vidcvideo_queue_dc_change(struct fb_devconfig *dc, int dc_change)
}
static u_char ri_col_data[6][6] = {
static const u_char ri_col_data[6][6] = {
{ 0, 0, 0, 0, 0, 0}, /* 1 bpp */
{ 0, 0, 0, 0, 0, 0}, /* 2 bpp */
{ 0, 0, 0, 0, 0, 0}, /* 4 bpp */
@ -614,7 +614,7 @@ static void
vidcvideo_colourmap_and_cursor_init(struct fb_devconfig *dc)
{
struct rasops_info *ri = &dc->dc_console.scr_ri;
u_char *rgbdat;
const u_char *rgbdat;
struct hwcmap256 *cm;
const u_int8_t *p;
int index;