From ce88b7c264ad97a0498124584cc079e43f9b1599 Mon Sep 17 00:00:00 2001 From: Romain Dolbeau Date: Sun, 11 Sep 2022 14:36:14 +0200 Subject: [PATCH] track HW changes --- .../NuBusFPGAInit/NuBusFPGAInit.c | 3 +++ .../NuBusFPGAInit/NuBusFPGA_HW.h | 19 ++++++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/nubus-to-ztex-gateware/NuBusFPGAInit/NuBusFPGAInit.c b/nubus-to-ztex-gateware/NuBusFPGAInit/NuBusFPGAInit.c index 8b23c46..bfcddf1 100644 --- a/nubus-to-ztex-gateware/NuBusFPGAInit/NuBusFPGAInit.c +++ b/nubus-to-ztex-gateware/NuBusFPGAInit/NuBusFPGAInit.c @@ -226,6 +226,9 @@ int hwblit(char* stack, char* p_fb_base, /* short dstshift, */ short mode, Patte #else WAIT_FOR_HW_LE(accel_le); + accel_le->reg_op = 0x3; // GXcopy + accel_le->reg_depth = 0; // current + accel_le->reg_width = (width); // pixels accel_le->reg_height = (height); accel_le->reg_bitblt_dst_x = (dstv.left); // pixels diff --git a/nubus-to-ztex-gateware/NuBusFPGAInit/NuBusFPGA_HW.h b/nubus-to-ztex-gateware/NuBusFPGAInit/NuBusFPGA_HW.h index b209b6c..518248a 100644 --- a/nubus-to-ztex-gateware/NuBusFPGAInit/NuBusFPGA_HW.h +++ b/nubus-to-ztex-gateware/NuBusFPGAInit/NuBusFPGA_HW.h @@ -17,11 +17,12 @@ #define WORK_IN_PROGRESS_BIT 0 // cmd -#define DO_BLIT_BIT 0 // hardwired in goblin_accel.py -#define DO_FILL_BIT 1 // hardwired in goblin_accel.py -#define DO_PATT_BIT 2 // hardwired in goblin_accel.py -#define DO_TEST_BIT 3 // hardwired in goblin_accel.py - +#define DO_BLIT_BIT 0 // all hardwired in goblin_accel.py +#define DO_FILL_BIT 1 +#define DO_PATT_BIT 2 +#define DO_RSMSK8DST32_BIT 3 +#define DO_RSRC32MSK32DST32_BIT 4 +#define DO_RSRC32DST32_BIT 5 #define FUN_DONE_BIT 31 @@ -40,11 +41,11 @@ struct goblin_accel_regs { u_int32_t reg_status; // 0 u_int32_t reg_cmd; u_int32_t reg_r5_cmd; - u_int32_t resv0; + u_int32_t reg_op; u_int32_t reg_width; // 4 u_int32_t reg_height; u_int32_t reg_fgcolor; - u_int32_t resv2; + u_int32_t reg_depth; u_int32_t reg_bitblt_src_x; // 8 u_int32_t reg_bitblt_src_y; u_int32_t reg_bitblt_dst_x; @@ -53,6 +54,10 @@ struct goblin_accel_regs { u_int32_t reg_dst_stride; u_int32_t reg_src_ptr; // 14 u_int32_t reg_dst_ptr; + u_int32_t reg_msk_x; // 16 + u_int32_t reg_msk_y; + u_int32_t reg_msk_stride; // 18 + u_int32_t reg_msk_ptr; };