From 55de1775655c50a6f5458e79d646efbbdc86b120 Mon Sep 17 00:00:00 2001
From: Tolik Trek <tolik.trek@gmail.com>
Date: Sun, 26 Apr 2026 16:47:36 +1000
Subject: [PATCH] update shared includes

---
 D2_FRAM.asm     | 8 ++++----
 DOOM2.asm       | 6 +++---
 Music_4x.asm    | 6 +++---
 Shared_Includes | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/D2_FRAM.asm b/D2_FRAM.asm
index c40a131..9f10066 100644
--- a/D2_FRAM.asm
+++ b/D2_FRAM.asm
@@ -1267,7 +1267,7 @@ SND_STOP:
 	PUSH AF
 	PUSH BC
 
-	LD BC,CBL.COVOX_OUT
+	LD BC,SP_SND.CBL.COVOX_OUT
 	LD A,#80
 SND_OUT_S:
 	OUT (C),A							; забить ковокс-бластер одним значением
@@ -1343,7 +1343,7 @@ COV_ADR+1:
 	LD B,A
 
 	LD HL,(SND_A)
-	LD C,CBL.COVOX_OUT
+	LD C,SP_SND.CBL.COVOX_OUT
 	LD D,16
 
 	IN A,(SLOT3)
@@ -1355,7 +1355,7 @@ COV_ADR+1:
 	;  OUT	(BorderColor),A
 	;
 
-	LD A,CBL.BUFFER_PAGE
+	LD A,SP_SND.CBL.BUFFER_PAGE
 	OUT (SLOT3),A
 
 L_DDX:
@@ -1432,7 +1432,7 @@ SND_INIT1:
 ;_------[Чтение секторов с диска]-------
 NO_NEW_COUNT:
 	LD HL,-SND_READ_SECTORS*512			; буфер для данных
-	LD A,CBL.BUFFER_PAGE				; страница буфера, если адрес в окне #C000
+	LD A,SP_SND.CBL.BUFFER_PAGE			; страница буфера, если адрес в окне #C000
 	LD DE,(SND_S1)					; абсолютный номер сектора Младшая часть
 	LD IX,(SND_S2)					; абсолютный номер сектора Старшая часть
 	LD B,SND_READ_SECTORS				; число читаемых секторов
diff --git a/DOOM2.asm b/DOOM2.asm
index 87c1642..943ec46 100644
--- a/DOOM2.asm
+++ b/DOOM2.asm
@@ -116,8 +116,8 @@ CMD_Line+1:
 
 
 ;-----[Инициализация Covox-Blaster]-----
-	ld bc,CBL.SYS_PORT
-	ld a,CBL.Blaster + CBL.Mono + CBL.is8bit + CBL.Int_off + CBL.KHz_16old
+	ld bc,SP_SND.CBL.SYS_PORT
+	ld a,SP_SND.CBL.Blaster + SP_SND.CBL.Mono + SP_SND.CBL.is8bit + SP_SND.CBL.Int_off + SP_SND.CBL.KHz_16old
 	out (c),a
 ;
 ;-----------[заглушить звук]------------
@@ -346,7 +346,7 @@ FLAG:			DB 0
 ;
 CLEAR_COVOX:
 	LD A,#80
-	LD BC,CBL.COVOX_OUT
+	LD BC,SP_SND.CBL.COVOX_OUT
 .CLEAR:	OUT (C),A
 	DJNZ .CLEAR
 	RET
diff --git a/Music_4x.asm b/Music_4x.asm
index c5d45ca..b1d087e 100644
--- a/Music_4x.asm
+++ b/Music_4x.asm
@@ -282,7 +282,7 @@ HDD_FN:	EX AF,AF'
 	 ;LD A,5			;!FIXIT
 	 ;OUT (SLOT1),A
 	 ;
-	 LD A,CBL.BUFFER_PAGE
+	 LD A,SP_SND.CBL.BUFFER_PAGE
 	 OUT (SLOT3),A
 	 IN A,(PORT_Y)
 	 PUSH AF
@@ -422,10 +422,10 @@ BPB_SetUp:
 	DEC D
 	JR NZ,.NEXT_ADD3
 
-	LD (SYS_PAGE.CLASTER_LEN),HL
+	LD (SYS_PAGE.CLUSTER_LEN),HL
 	LD B,E
 	LD C,A
-	LD (SYS_PAGE.CLASTER_LEN2),BC
+	LD (SYS_PAGE.CLUSTER_LEN2),BC
 	;
 	; DE=0
 	EX DE,HL	;LD HL,0
diff --git a/Shared_Includes b/Shared_Includes
index a0e68ce..e1dc7ec 160000
--- a/Shared_Includes
+++ b/Shared_Includes
@@ -1 +1 @@
-Subproject commit a0e68ce3a19bd47537585e49bfbf5e45fab197a1
+Subproject commit e1dc7ec10dc9c7e9153a05884e42973a57378a63