diff options
Diffstat (limited to 'apps/plugins/zxbox')
-rw-r--r-- | apps/plugins/zxbox/sp_def.h | 4 | ||||
-rw-r--r-- | apps/plugins/zxbox/spkey.c | 4 | ||||
-rw-r--r-- | apps/plugins/zxbox/spscr.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/apps/plugins/zxbox/sp_def.h b/apps/plugins/zxbox/sp_def.h index 1030be120c..931804ff9c 100644 --- a/apps/plugins/zxbox/sp_def.h +++ b/apps/plugins/zxbox/sp_def.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 1996-1998 Szeredi Miklos | 2 | * Copyright (C) 1996-1998 Szeredi Miklos |
3 | * Email: mszeredi@inf.bme.hu | 3 | * Email: mszeredi@inf.bme.hu |
4 | * | 4 | * |
@@ -20,7 +20,7 @@ | |||
20 | 20 | ||
21 | #include "spperif.h" | 21 | #include "spperif.h" |
22 | 22 | ||
23 | #define MARK_SCR(addr) SPNM(scr_mark)[(addr) >> 5] |= 1 << ((addr) & 0x1F) | 23 | #define MARK_SCR(addr) SPNM(scr_mark)[(addr) >> 5] |= BIT_N((addr) & 0x1F) |
24 | 24 | ||
25 | #define PUTMEM(addr, ptr, val) \ | 25 | #define PUTMEM(addr, ptr, val) \ |
26 | { \ | 26 | { \ |
diff --git a/apps/plugins/zxbox/spkey.c b/apps/plugins/zxbox/spkey.c index a21aed6af2..77427e8015 100644 --- a/apps/plugins/zxbox/spkey.c +++ b/apps/plugins/zxbox/spkey.c | |||
@@ -85,7 +85,7 @@ int spkb_state_changed; | |||
85 | 85 | ||
86 | #define SKE {0, 0, 0, 0, 0, 0, 0, 0} | 86 | #define SKE {0, 0, 0, 0, 0, 0, 0, 0} |
87 | 87 | ||
88 | #define SKP(x) (1 << x) | 88 | #define SKP(x) BIT_N(x) |
89 | 89 | ||
90 | #define SKN0(x) {SKP(x), 0, 0, 0, 0, 0, 0, 0} | 90 | #define SKN0(x) {SKP(x), 0, 0, 0, 0, 0, 0, 0} |
91 | #define SKN1(x) {0, SKP(x), 0, 0, 0, 0, 0, 0} | 91 | #define SKN1(x) {0, SKP(x), 0, 0, 0, 0, 0, 0} |
@@ -617,7 +617,7 @@ static void copy_basekeys(struct spbasekey *addk) | |||
617 | static unsigned transform_shift(int modif) | 617 | static unsigned transform_shift(int modif) |
618 | { | 618 | { |
619 | if(!modif) return 0; | 619 | if(!modif) return 0; |
620 | else return (1 << (modif - 1)); | 620 | else return BIT_N(modif - 1); |
621 | } | 621 | } |
622 | 622 | ||
623 | 623 | ||
diff --git a/apps/plugins/zxbox/spscr.c b/apps/plugins/zxbox/spscr.c index 2c24fb37a8..d419ff0c66 100644 --- a/apps/plugins/zxbox/spscr.c +++ b/apps/plugins/zxbox/spscr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (C) 1996-1998 Szeredi Miklos | 2 | * Copyright (C) 1996-1998 Szeredi Miklos |
3 | * Email: mszeredi@inf.bme.hu | 3 | * Email: mszeredi@inf.bme.hu |
4 | * | 4 | * |
@@ -82,7 +82,7 @@ byte *update_screen_line(byte *scrp, int coli, int scri, int border, | |||
82 | SPNM(imag_mark)[coli] |= mark; | 82 | SPNM(imag_mark)[coli] |= mark; |
83 | SPNM(imag_horiz) |= mark; | 83 | SPNM(imag_horiz) |= mark; |
84 | coli >>= 3; | 84 | coli >>= 3; |
85 | SPNM(imag_vert) |= (1 << coli); | 85 | SPNM(imag_vert) |= BIT_N(coli); |
86 | 86 | ||
87 | spmp = PRNM(proc).mem + (scri << 5); | 87 | spmp = PRNM(proc).mem + (scri << 5); |
88 | spcp = PRNM(proc).mem + 0x5800 + (coli << 5); | 88 | spcp = PRNM(proc).mem + 0x5800 + (coli << 5); |