Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-25 01:39:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix compilation with GCC 4.0-20041219.

Browse source 
- Don't try to stick (1 << 8) into entry.delivery_mode which is 3-bit integer.

svn path=/trunk/; revision=12325
This commit is contained in:
Filip Navara 2004-12-25 11:21:48 +00:00
parent f73524a056
commit 37dca7acbd
4 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/hal/halx86/include/apic.h
View file

@ -62,11 +62,11 @@
#define APIC_ICR0_DESTS (0x3 << 18) /* Destination Shorthand */ #define APIC_ICR0_DESTS (0x3 << 18) /* Destination Shorthand */
/* Delivery Modes */ /* Delivery Modes */
#define APIC_DM_FIXED (0x0 << 8) #define APIC_DM_FIXED (0x0 << 8)
#define APIC_DM_LOWEST (0x1 << 8) #define APIC_DM_LOWEST (0x1 << 8)
#define APIC_DM_SMI (0x2 << 8) #define APIC_DM_SMI (0x2 << 8)
#define APIC_DM_REMRD (0x3 << 8) #define APIC_DM_REMRD (0x3 << 8)
#define APIC_DM_NMI (0x4 << 8) #define APIC_DM_NMI (0x4 << 8)
#define APIC_DM_INIT (0x5 << 8) #define APIC_DM_INIT (0x5 << 8)
#define APIC_DM_STARTUP (0x6 << 8) #define APIC_DM_STARTUP (0x6 << 8)
#define APIC_DM_EXTINT (0x7 << 8) #define APIC_DM_EXTINT (0x7 << 8)
@ -174,7 +174,7 @@ typedef struct _CPU_INFO
/* Prototypes */ /* Prototypes */
volatile inline ULONG APICRead(ULONG Offset); inline ULONG APICRead(ULONG Offset);
inline VOID APICWrite(ULONG Offset, ULONG Value); inline VOID APICWrite(ULONG Offset, ULONG Value);
VOID APICSendIPI(ULONG Target, ULONG Mode); VOID APICSendIPI(ULONG Target, ULONG Mode);

2
reactos/hal/halx86/include/mps.h
View file

@ -280,7 +280,7 @@ typedef enum {
/* Prototypes */ /* Prototypes */
VOID HalpInitMPS(VOID); VOID HalpInitMPS(VOID);
volatile ULONG IOAPICRead(ULONG Apic, ULONG Offset); ULONG IOAPICRead(ULONG Apic, ULONG Offset);
VOID IOAPICWrite(ULONG Apic, ULONG Offset, ULONG Value); VOID IOAPICWrite(ULONG Apic, ULONG Offset, ULONG Value);
VOID IOAPICMaskIrq(ULONG Irq); VOID IOAPICMaskIrq(ULONG Irq);
VOID IOAPICUnmaskIrq(ULONG Irq); VOID IOAPICUnmaskIrq(ULONG Irq);

8
reactos/hal/halx86/mp/apic.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: apic.c,v 1.1 2004/12/03 20:10:44 gvg Exp $ /* $Id: apic.c,v 1.2 2004/12/25 11:21:48 navaraf Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -261,7 +261,7 @@ VOID HaliInitBSP(VOID)
APICCalibrateTimer(BootCPU); APICCalibrateTimer(BootCPU);
} }
volatile inline ULONG _APICRead(ULONG Offset) inline ULONG _APICRead(ULONG Offset)
{ {
PULONG p; PULONG p;
@ -297,7 +297,7 @@ inline VOID APICWrite(ULONG Offset,
#if 0 #if 0
volatile inline ULONG APICRead(ULONG Offset) inline ULONG APICRead(ULONG Offset)
{ {
PULONG p; PULONG p;
@ -305,7 +305,7 @@ volatile inline ULONG APICRead(ULONG Offset)
return *p; return *p;
} }
#else #else
volatile inline ULONG APICRead(ULONG Offset) inline ULONG APICRead(ULONG Offset)
{ {
PULONG p; PULONG p;
ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24; ULONG CPU = (_APICRead(APIC_ID) & APIC_ID_MASK) >> 24;

6
reactos/hal/halx86/mp/processor_mp.c
View file

@ -1,4 +1,4 @@
/* $Id: processor_mp.c,v 1.1 2004/12/03 20:10:44 gvg Exp $ /* $Id: processor_mp.c,v 1.2 2004/12/25 11:21:48 navaraf Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -126,7 +126,7 @@ VOID Enable8259AIrq(ULONG irq)
/* Functions for handling I/O APICs */ /* Functions for handling I/O APICs */
volatile ULONG IOAPICRead(ULONG Apic, ULONG Offset) ULONG IOAPICRead(ULONG Apic, ULONG Offset)
{ {
PULONG Base; PULONG Base;
@ -616,7 +616,7 @@ VOID IOAPICSetupIrqs(VOID)
*/ */
memset(&entry,0,sizeof(entry)); memset(&entry,0,sizeof(entry));
entry.delivery_mode = APIC_DM_LOWEST; entry.delivery_mode = (APIC_DM_LOWEST >> 8);
entry.dest_mode = 1; /* logical delivery */ entry.dest_mode = 1; /* logical delivery */
entry.mask = 1; /* disable IRQ */ entry.mask = 1; /* disable IRQ */
#if 0 #if 0