diff options
| author |   kettenis <kettenis@openbsd.org> | 2014-05-26 19:03:28 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2014-05-26 19:03:28 +0000 |
| commit | e332ef3639512f3c1cf03e5601f94268e0b42697 (patch) | |
| tree | b9d37d414fa378f0ffe4e91d7a51586dcb01e036 | |
| parent | Do not change the state of the carry bit in the psr when returning with (diff) | |
| download | wireguard-openbsd-e332ef3639512f3c1cf03e5601f94268e0b42697.tar.xz wireguard-openbsd-e332ef3639512f3c1cf03e5601f94268e0b42697.zip | |
Replace some magic constants with appropriate defines.
ok krw@, deraadt@
| -rw-r--r-- | sys/arch/amd64/amd64/mpbios.c | 14 | ||||
| -rw-r--r-- | sys/arch/i386/i386/mpbios.c | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sys/arch/amd64/amd64/mpbios.c b/sys/arch/amd64/amd64/mpbios.c index f7aed069e90..aef32f6ffa1 100644 --- a/sys/arch/amd64/amd64/mpbios.c +++ b/sys/arch/amd64/amd64/mpbios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpbios.c,v 1.21 2011/10/21 20:48:11 kettenis Exp $ */ +/* $OpenBSD: mpbios.c,v 1.22 2014/05/26 19:03:28 kettenis Exp $ */ /* $NetBSD: mpbios.c,v 1.7 2003/05/15 16:32:50 fvdl Exp $ */ /*- @@ -751,8 +751,8 @@ mp_cfg_special_intr(const struct mpbios_int *entry, u_int32_t *redir) void mp_cfg_pci_intr(const struct mpbios_int *entry, u_int32_t *redir) { - int mpspo = entry->int_flags & 0x03; /* XXX magic */ - int mpstrig = (entry->int_flags >> 2) & 0x03; /* XXX magic */ + int mpspo = (entry->int_flags >> MPS_INTPO_SHIFT) & MPS_INTPO_MASK; + int mpstrig = (entry->int_flags >> MPS_INTTR_SHIFT) & MPS_INTTR_MASK; *redir &= ~IOAPIC_REDLO_DEL_MASK; switch (mpspo) { @@ -790,8 +790,8 @@ mp_cfg_pci_intr(const struct mpbios_int *entry, u_int32_t *redir) void mp_cfg_eisa_intr(const struct mpbios_int *entry, u_int32_t *redir) { - int mpspo = entry->int_flags & 0x03; /* XXX magic */ - int mpstrig = (entry->int_flags >> 2) & 0x03; /* XXX magic */ + int mpspo = (entry->int_flags >> MPS_INTPO_SHIFT) & MPS_INTPO_MASK; + int mpstrig = (entry->int_flags >> MPS_INTTR_SHIFT) & MPS_INTTR_MASK; *redir &= ~IOAPIC_REDLO_DEL_MASK; switch (mpspo) { @@ -841,8 +841,8 @@ mp_cfg_eisa_intr(const struct mpbios_int *entry, u_int32_t *redir) void mp_cfg_isa_intr(const struct mpbios_int *entry, u_int32_t *redir) { - int mpspo = entry->int_flags & 0x03; /* XXX magic */ - int mpstrig = (entry->int_flags >> 2) & 0x03; /* XXX magic */ + int mpspo = (entry->int_flags >> MPS_INTPO_SHIFT) & MPS_INTPO_MASK; + int mpstrig = (entry->int_flags >> MPS_INTTR_SHIFT) & MPS_INTTR_MASK; *redir &= ~IOAPIC_REDLO_DEL_MASK; switch (mpspo) { diff --git a/sys/arch/i386/i386/mpbios.c b/sys/arch/i386/i386/mpbios.c index aebb80401dc..bb3ab9be2ba 100644 --- a/sys/arch/i386/i386/mpbios.c +++ b/sys/arch/i386/i386/mpbios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpbios.c,v 1.34 2011/10/21 18:16:13 kettenis Exp $ */ +/* $OpenBSD: mpbios.c,v 1.35 2014/05/26 19:03:28 kettenis Exp $ */ /* $NetBSD: mpbios.c,v 1.2 2002/10/01 12:56:57 fvdl Exp $ */ /*- @@ -823,8 +823,8 @@ mp_cfg_special_intr(const struct mpbios_int *entry, u_int32_t *redir) void mp_cfg_pci_intr(const struct mpbios_int *entry, u_int32_t *redir) { - int mpspo = entry->int_flags & 0x03; /* XXX magic */ - int mpstrig = (entry->int_flags >> 2) & 0x03; /* XXX magic */ + int mpspo = (entry->int_flags >> MPS_INTPO_SHIFT) & MPS_INTPO_MASK; + int mpstrig = (entry->int_flags >> MPS_INTTR_SHIFT) & MPS_INTTR_MASK; *redir &= ~IOAPIC_REDLO_DEL_MASK; switch (mpspo) { @@ -861,8 +861,8 @@ mp_cfg_pci_intr(const struct mpbios_int *entry, u_int32_t *redir) void mp_cfg_eisa_intr(const struct mpbios_int *entry, u_int32_t *redir) { - int mpspo = entry->int_flags & 0x03; /* XXX magic */ - int mpstrig = (entry->int_flags >> 2) & 0x03; /* XXX magic */ + int mpspo = (entry->int_flags >> MPS_INTPO_SHIFT) & MPS_INTPO_MASK; + int mpstrig = (entry->int_flags >> MPS_INTTR_SHIFT) & MPS_INTTR_MASK; *redir &= ~IOAPIC_REDLO_DEL_MASK; switch (mpspo) { @@ -911,8 +911,8 @@ mp_cfg_eisa_intr(const struct mpbios_int *entry, u_int32_t *redir) void mp_cfg_isa_intr(const struct mpbios_int *entry, u_int32_t *redir) { - int mpspo = entry->int_flags & 0x03; /* XXX magic */ - int mpstrig = (entry->int_flags >> 2) & 0x03; /* XXX magic */ + int mpspo = (entry->int_flags >> MPS_INTPO_SHIFT) & MPS_INTPO_MASK; + int mpstrig = (entry->int_flags >> MPS_INTTR_SHIFT) & MPS_INTTR_MASK; *redir &= ~IOAPIC_REDLO_DEL_MASK; switch (mpspo) { |