diff options
author | Matthieu Herrb <matthieu@herrb.eu> | 2024-08-02 08:32:14 +0200 |
---|---|---|
committer | Matthieu Herrb <matthieu@herrb.eu> | 2024-08-02 08:32:14 +0200 |
commit | 9627fd587c9aa066d4ce6e852b26950030f9c3cd (patch) | |
tree | 50375cab018b3b62076bf4a6a674fca7613db68b /src/cim/cim_gp.c | |
parent | 8b6ec6bb08fa9c3b19753acb436bbb8ecfae9233 (diff) | |
parent | 7047b6da264e946e77eeee4080d194c807562d68 (diff) |
Merge remote-tracking branch 'origin/master' into obsdobsd
Diffstat (limited to 'src/cim/cim_gp.c')
-rw-r--r-- | src/cim/cim_gp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/cim/cim_gp.c b/src/cim/cim_gp.c index 2085d4f..4ab909f 100644 --- a/src/cim/cim_gp.c +++ b/src/cim/cim_gp.c @@ -2642,7 +2642,7 @@ gp_masked_blt(unsigned long dstoffset, unsigned long width, unsigned long total_dwords, size_dwords; unsigned long dword_count, byte_count; unsigned long srcoffset, size; - unsigned long i, ch3_offset, base; + unsigned long j, ch3_offset, base; unsigned long flags = 0; if (gp3_blt_flags & CIMGP_BLTFLAGS_INVERTMONO) @@ -2688,7 +2688,7 @@ gp_masked_blt(unsigned long dstoffset, unsigned long width, WRITE_GP32(GP3_CMD_WRITE, gp3_cmd_next); gp3_cmd_current = gp3_cmd_next; - for (i = 0; i < height; i++) { + for (j = 0; j < height; j++) { /* UPDATE THE COMMAND POINTER * The WRITE_COMMANDXX macros use a pointer to the current buffer * space. This is created by adding gp3_cmd_current to the base @@ -2880,7 +2880,7 @@ gp_screen_to_screen_masked(unsigned long dstoffset, unsigned long srcoffset, unsigned long total_dwords, size_dwords; unsigned long dword_count, byte_count; unsigned long srcoff, size; - unsigned long i, base; + unsigned long j, base; unsigned long flags = 0; if (gp3_blt_flags & CIMGP_BLTFLAGS_INVERTMONO) @@ -2926,7 +2926,7 @@ gp_screen_to_screen_masked(unsigned long dstoffset, unsigned long srcoffset, WRITE_GP32(GP3_CMD_WRITE, gp3_cmd_next); gp3_cmd_current = gp3_cmd_next; - for (i = 0; i < height; i++) { + for (j = 0; j < height; j++) { /* UPDATE THE COMMAND POINTER * The WRITE_COMMANDXX macros use a pointer to the current buffer * space. This is created by adding gp3_cmd_current to the base |