Re: CVS commit: src/sys/arch/x86/include

[Christoph Egger <Christoph_Egger%gmx.de@localhost>]

Andrew Doran wrote:
> On Sat, May 10, 2008 at 12:31:53AM +0200, Christoph Egger wrote:
>
> > Andrew Doran wrote:
> > > Something is wrong with this picture... Have I made a mistake with the
> > > commands below?
> > I think, someone did not compile-test :)
>
> What error do you get? Read the diffs, I think that the CVS server has
> corrupted the change.

./x86/i82489reg.h:111:1: error: "LAPIC_ID_MASK" redefined
./x86/i82489reg.h:39:1: error: this is the location of the previous 
definition

Christoph


> Andrew
>  
> > > Andrew
> > >
> > > spanners$ cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x86/include/i82489reg.h    
> > > Enter passphrase for key '/home/ad/.ssh/id_rsa': 
> > > Index: src/sys/arch/x86/include/i82489reg.h
> > > diff -u src/sys/arch/x86/include/i82489reg.h:1.5 
> > > src/sys/arch/x86/include/i82489reg.h:1.6
> > > --- src/sys/arch/x86/include/i82489reg.h:1.5    Mon Apr 28 20:23:40 2008
> > > +++ src/sys/arch/x86/include/i82489reg.h        Fri May  9 21:23:48 2008
> > > @@ -1,7 +1,7 @@
> > > -/*     $NetBSD: i82489reg.h,v 1.5 2008/04/28 20:23:40 martin Exp $     */
> > > +/*     $NetBSD: i82489reg.h,v 1.6 2008/05/09 21:23:48 ad Exp $ */
> > >
> > > /*-
> > > - * Copyright (c) 1998 The NetBSD Foundation, Inc.
> > > + * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
> > >  * All rights reserved.
> > >  *
> > >  * This code is derived from software contributed to The NetBSD Foundation
> > > @@ -36,7 +36,7 @@
> > >  */
> > >
> > > #define        LAPIC_ID                0x020           /* ID. RW */
> > > -#      define LAPIC_ID_MASK            0x0f000000
> > > +#      define LAPIC_ID_MASK            0xff000000
> > > #      define LAPIC_ID_SHIFT           24
> > >
> > > #define LAPIC_VERS             0x030           /* Version. R */
> > > spanners$ cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x86/include/i82489reg.h    
> > > Enter passphrase for key '/home/ad/.ssh/id_rsa': 
> > > Index: src/sys/arch/x86/include/i82489reg.h
> > > diff -u src/sys/arch/x86/include/i82489reg.h:1.6 
> > > src/sys/arch/x86/include/i82489reg.h:1.7
> > > --- src/sys/arch/x86/include/i82489reg.h:1.6    Fri May  9 21:23:48 2008
> > > +++ src/sys/arch/x86/include/i82489reg.h        Fri May  9 21:53:56 2008
> > > @@ -1,4 +1,4 @@
> > > -/*     $NetBSD: i82489reg.h,v 1.6 2008/05/09 21:23:48 ad Exp $ */
> > > +/*     $NetBSD: i82489reg.h,v 1.7 2008/05/09 21:53:56 cegger Exp $     */
> > >
> > > /*-
> > >  * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
> > > @@ -108,8 +108,6 @@
> > >
> > >
> > > #define LAPIC_ICRHI    0x310                   /* Int. cmd. RW */
> > > -#      define LAPIC_ID_MASK            0x0f000000
> > > -#      define LAPIC_ID_SHIFT           24
> > >
> > > #define LAPIC_LVTT     0x320                   /* Loc.vec.(timer) RW */
> > > #      define LAPIC_LVTT_VEC_MASK      0x000000ff