Tue Apr 21 14:51:49 2009 UTC ()
Remove extra ')'.


(elad)
diff -r1.11 -r1.12 src/sys/arch/i386/i386/ipkdb_glue.c
cvs diff -r1.11 -r1.12 src/sys/arch/i386/i386/Attic/ipkdb_glue.c (expand / switch to unified diff)

--- src/sys/arch/i386/i386/Attic/ipkdb_glue.c 2009/03/18 10:22:30 1.11
+++ src/sys/arch/i386/i386/Attic/ipkdb_glue.c 2009/04/21 14:51:49 1.12
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: ipkdb_glue.c,v 1.11 2009/03/18 10:22:30 cegger Exp $ */ 1/* $NetBSD: ipkdb_glue.c,v 1.12 2009/04/21 14:51:49 elad Exp $ */
2 2
3/* 3/*
4 * Copyright (C) 2000 Wolfgang Solfrank. 4 * Copyright (C) 2000 Wolfgang Solfrank.
5 * Copyright (C) 2000 TooLs GmbH. 5 * Copyright (C) 2000 TooLs GmbH.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -21,27 +21,27 @@ @@ -21,27 +21,27 @@
21 * 21 *
22 * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR 22 * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
23 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 23 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
24 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. 24 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
25 * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 25 * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
26 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NO TLIMITED TO, 26 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NO TLIMITED TO,
27 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA OR PROFITS; 27 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA OR PROFITS;
28 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 28 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
29 * WHETHER IN CONTRACT, STRUCT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR 29 * WHETHER IN CONTRACT, STRUCT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
30 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF 30 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
31 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 31 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
32 */ 32 */
33#include <sys/cdefs.h> 33#include <sys/cdefs.h>
34__KERNEL_RCSID(0, "$NetBSD: ipkdb_glue.c,v 1.11 2009/03/18 10:22:30 cegger Exp $"); 34__KERNEL_RCSID(0, "$NetBSD: ipkdb_glue.c,v 1.12 2009/04/21 14:51:49 elad Exp $");
35 35
36#include "opt_ipkdb.h" 36#include "opt_ipkdb.h"
37 37
38#include <sys/param.h> 38#include <sys/param.h>
39#include <sys/systm.h> 39#include <sys/systm.h>
40 40
41#include <ipkdb/ipkdb.h> 41#include <ipkdb/ipkdb.h>
42 42
43#include <machine/ipkdb.h> 43#include <machine/ipkdb.h>
44#include <machine/psl.h> 44#include <machine/psl.h>
45 45
46int ipkdbregs[NREG]; 46int ipkdbregs[NREG];
47 47
@@ -62,27 +62,27 @@ ipkdbinit(void) @@ -62,27 +62,27 @@ ipkdbinit(void)
62} 62}
63 63
64int 64int
65ipkdb_poll(void) 65ipkdb_poll(void)
66{ 66{
67 /* For now */ 67 /* For now */
68 return 0; 68 return 0;
69} 69}
70 70
71void 71void
72ipkdb_trap(void) 72ipkdb_trap(void)
73{ 73{
74 ipkdb_mode = IPKDB_CMD_STEP; 74 ipkdb_mode = IPKDB_CMD_STEP;
75 x86_write_eflags(x86_read_eflags() | PSL_T)); 75 x86_write_eflags(x86_read_eflags() | PSL_T);
76} 76}
77 77
78int 78int
79ipkdb_trap_glue(struct trapframe frame) 79ipkdb_trap_glue(struct trapframe frame)
80{ 80{
81 if (ISPL(frame.tf_cs) != SEL_KPL) 81 if (ISPL(frame.tf_cs) != SEL_KPL)
82 return 0; 82 return 0;
83 83
84 if (ipkdb_mode == IPKDB_CMD_EXIT 84 if (ipkdb_mode == IPKDB_CMD_EXIT
85 || (ipkdb_mode != IPKDB_CMD_STEP && frame.tf_trapno == T_TRCTRAP)) 85 || (ipkdb_mode != IPKDB_CMD_STEP && frame.tf_trapno == T_TRCTRAP))
86 return 0; 86 return 0;
87 87
88 x86_disable_intr(); /* Interrupts need to be disabled while in IPKDB */ 88 x86_disable_intr(); /* Interrupts need to be disabled while in IPKDB */