From e279f7630ec43e8cba665ad32babbc782c3a8f75 Mon Sep 17 00:00:00 2001 From: Maxim Date: Tue, 12 Nov 2024 14:40:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0.=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BE=D0=BF=D1=80=D0=BE=D1=81=D0=B0=20?= =?UTF-8?q?=D0=A3=D0=9A=D0=9F=20=D0=B8=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20?= =?UTF-8?q?=D0=B2=20=D1=88=D0=B8=D1=80=D0=BE=D0=BA=D0=BE=D0=B2=D0=B5=D1=89?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85?= =?UTF-8?q?=20(103=20=D0=B1=D1=83=D1=84=D0=B5=D1=80)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Core/Src/pribors.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/Core/Src/pribors.c b/Core/Src/pribors.c index a422eb3..52f9e5b 100644 --- a/Core/Src/pribors.c +++ b/Core/Src/pribors.c @@ -107,8 +107,8 @@ uint16_t set_status_prd(unsigned char *buf) for (uint16_t i = 1; i <14; i++) { - write_isa( BASE_ADDR_EMS_G + 0xC, i ); - ports_data = read_isa( BASE_ADDR_EMS_G + 0xE ); + write_isa(BASE_ADDR_EMS_G + 0xC, i ); + ports_data = read_isa(BASE_ADDR_EMS_G + 0xE ); buf[9 + (i - 1) * 2] = ports_data & 0xFF; buf[10 + (i -1) * 2] = ports_data >> 8; } @@ -120,24 +120,28 @@ uint16_t set_status_prd(unsigned char *buf) buf[37] = ports_data & 0xFF; buf[38] = ports_data >> 8; - ports_data = 0x55AA; //BASE_ADDR_UKP0 - for (uint16_t i = 0; i <8; i++) - { + for (uint16_t i = 0; i <16; i++) + { + ports_data = read_isa(BASE_ADDR_UKP0 + 0x8); buf[39 + i * 2] = ports_data & 0xFF; buf[40 + i * 2] = ports_data >> 8; } + write_isa(BASE_ADDR_UKP0 + 0x4, 1); + //BASE_ADDR_UKP1 - for (uint16_t i = 0; i <8; i++) + for (uint16_t i = 0; i <16; i++) { - buf[55 + i * 2] = ports_data & 0xFF; - buf[56 + i * 2] = ports_data >> 8; + ports_data = read_isa(BASE_ADDR_UKP1 + 0x8); + buf[71 + i * 2] = ports_data & 0xFF; + buf[72 + i * 2] = ports_data >> 8; } + write_isa(BASE_ADDR_UKP1 + 0x4, 1); pribor_type = PRIBOR_TYPE_PRD; - buf[6] = 63; + buf[6] = 103; return buf[6] + 2; }