hw/intc/loongarch_pch: Remove some duplicate macro

The meaning of macro definition STATUS_LO_START is simliar with
PCH_PIC_INT_STATUS, only that offset is different, the same for
macro POL_LO_START. Now remove these duplicated macro definitions.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20250507023148.1877287-4-maobibo@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
This commit is contained in:
Bibo Mao 2025-05-07 10:31:35 +08:00 committed by Song Gao
parent 4f0f2ab564
commit e95e4e818b
2 changed files with 10 additions and 15 deletions

View file

@ -208,19 +208,19 @@ static uint64_t loongarch_pch_pic_high_readw(void *opaque, hwaddr addr,
{ {
LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque); LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque);
uint64_t val = 0; uint64_t val = 0;
uint32_t offset = addr & 0xfff; uint32_t offset = addr + PCH_PIC_INT_STATUS;
switch (offset) { switch (offset) {
case STATUS_LO_START: case PCH_PIC_INT_STATUS:
val = (uint32_t)(s->intisr & (~s->int_mask)); val = (uint32_t)(s->intisr & (~s->int_mask));
break; break;
case STATUS_HI_START: case PCH_PIC_INT_STATUS + 4:
val = (s->intisr & (~s->int_mask)) >> 32; val = (s->intisr & (~s->int_mask)) >> 32;
break; break;
case POL_LO_START: case PCH_PIC_INT_POL:
val = (uint32_t)s->int_polarity; val = (uint32_t)s->int_polarity;
break; break;
case POL_HI_START: case PCH_PIC_INT_POL + 4:
val = s->int_polarity >> 32; val = s->int_polarity >> 32;
break; break;
default: default:
@ -236,21 +236,21 @@ static void loongarch_pch_pic_high_writew(void *opaque, hwaddr addr,
{ {
LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque); LoongArchPICCommonState *s = LOONGARCH_PIC_COMMON(opaque);
uint32_t offset, data = (uint32_t)value; uint32_t offset, data = (uint32_t)value;
offset = addr & 0xfff; offset = addr + PCH_PIC_INT_STATUS;
trace_loongarch_pch_pic_high_writew(size, addr, data); trace_loongarch_pch_pic_high_writew(size, addr, data);
switch (offset) { switch (offset) {
case STATUS_LO_START: case PCH_PIC_INT_STATUS:
s->intisr = get_writew_val(s->intisr, data, 0); s->intisr = get_writew_val(s->intisr, data, 0);
break; break;
case STATUS_HI_START: case PCH_PIC_INT_STATUS + 4:
s->intisr = get_writew_val(s->intisr, data, 1); s->intisr = get_writew_val(s->intisr, data, 1);
break; break;
case POL_LO_START: case PCH_PIC_INT_POL:
s->int_polarity = get_writew_val(s->int_polarity, data, 0); s->int_polarity = get_writew_val(s->int_polarity, data, 0);
break; break;
case POL_HI_START: case PCH_PIC_INT_POL + 4:
s->int_polarity = get_writew_val(s->int_polarity, data, 1); s->int_polarity = get_writew_val(s->int_polarity, data, 1);
break; break;
default: default:

View file

@ -26,11 +26,6 @@
#define PCH_PIC_INT_STATUS 0x3a0 #define PCH_PIC_INT_STATUS 0x3a0
#define PCH_PIC_INT_POL 0x3e0 #define PCH_PIC_INT_POL 0x3e0
#define STATUS_LO_START 0
#define STATUS_HI_START 0x4
#define POL_LO_START 0x40
#define POL_HI_START 0x44
#define TYPE_LOONGARCH_PIC_COMMON "loongarch_pic_common" #define TYPE_LOONGARCH_PIC_COMMON "loongarch_pic_common"
OBJECT_DECLARE_TYPE(LoongArchPICCommonState, OBJECT_DECLARE_TYPE(LoongArchPICCommonState,
LoongArchPICCommonClass, LOONGARCH_PIC_COMMON) LoongArchPICCommonClass, LOONGARCH_PIC_COMMON)