From 98d39923c6d16fe2b0bef8e4370fcaf0bc6695fe Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Tue, 16 Nov 2021 00:28:47 +0000
Subject: [PATCH] Rename drivers: - intelac97 > ac97 - intel_hda > hdaudio To
 fit into 8.3

git-svn-id: svn://kolibrios.org@9274 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 data/Tupfile.lua                                       | 4 ++--
 drivers/audio/{intelac97.asm => ac97.asm}              | 0
 drivers/audio/intel_hda/Tupfile.lua                    | 2 +-
 drivers/audio/intel_hda/{intel_hda.asm => hdaudio.asm} | 0
 drivers/audio/sound.asm                                | 4 ++--
 programs/cmm/dicty/dicty.c                             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename drivers/audio/{intelac97.asm => ac97.asm} (100%)
 rename drivers/audio/intel_hda/{intel_hda.asm => hdaudio.asm} (100%)

diff --git a/data/Tupfile.lua b/data/Tupfile.lua
index 9bdd49c960..60ac572504 100644
--- a/data/Tupfile.lua
+++ b/data/Tupfile.lua
@@ -544,11 +544,11 @@ tup.append_table(img_files, {
  {"DRIVERS/COMMOUSE.SYS", "../drivers/mouse/commouse.sys"},
  {"DRIVERS/PS2MOUSE.SYS", "../drivers/mouse/ps2mouse4d/trunk/ps2mouse.sys"},
  {"DRIVERS/TMPDISK.SYS", "../drivers/disk/tmpdisk.sys"},
- {"DRIVERS/intel_hda.sys", "../drivers/audio/intel_hda/intel_hda.sys"},
+ {"DRIVERS/HDAUDIO.SYS", "../drivers/audio/intel_hda/hdaudio.sys"},
  {"DRIVERS/SB16.SYS", "../drivers/audio/sb16/sb16.sys"},
  {"DRIVERS/SOUND.SYS", "../drivers/audio/sound.sys"},
  {"DRIVERS/INFINITY.SYS", "../drivers/audio/infinity/infinity.sys"},
- {"DRIVERS/INTELAC97.SYS", "../drivers/audio/intelac97.sys"},
+ {"DRIVERS/AC97.SYS", "../drivers/audio/ac97.sys"},
  {"DRIVERS/EMU10K1X.SYS", "../drivers/audio/emu10k1x.sys"},
  {"DRIVERS/FM801.SYS", "../drivers/audio/fm801.sys"},
  {"DRIVERS/VT823X.SYS", "../drivers/audio/vt823x.sys"},
diff --git a/drivers/audio/intelac97.asm b/drivers/audio/ac97.asm
similarity index 100%
rename from drivers/audio/intelac97.asm
rename to drivers/audio/ac97.asm
diff --git a/drivers/audio/intel_hda/Tupfile.lua b/drivers/audio/intel_hda/Tupfile.lua
index d69a7d625f..03750801fa 100644
--- a/drivers/audio/intel_hda/Tupfile.lua
+++ b/drivers/audio/intel_hda/Tupfile.lua
@@ -1,3 +1,3 @@
 if tup.getconfig("NO_FASM") ~= "" then return end
 ROOT = "../../.."
-tup.rule("intel_hda.asm", "fasm %f %o " .. tup.getconfig("PESTRIP_CMD") .. tup.getconfig("KPACK_CMD"), "%B.sys")
+tup.rule("hdaudio.asm", "fasm %f %o " .. tup.getconfig("PESTRIP_CMD") .. tup.getconfig("KPACK_CMD"), "%B.sys")
diff --git a/drivers/audio/intel_hda/intel_hda.asm b/drivers/audio/intel_hda/hdaudio.asm
similarity index 100%
rename from drivers/audio/intel_hda/intel_hda.asm
rename to drivers/audio/intel_hda/hdaudio.asm
diff --git a/drivers/audio/sound.asm b/drivers/audio/sound.asm
index ee0bc9234a..03f831cd57 100644
--- a/drivers/audio/sound.asm
+++ b/drivers/audio/sound.asm
@@ -419,13 +419,13 @@ devices         dd (CTRL_ICH  shl 16)+VID_INTEL, intelac97
 
 srv_entry       dd 0
 
-intelac97       db 'INTELAC97', 0
+intelac97       db 'AC97', 0
 vt823x          db 'VT823X', 0
 sis             db 'SIS', 0
 fm801           db 'FM801', 0
 ensoniq         db 'ENSONIQ', 0
 emu10k1x        db 'EMU10K1X', 0
-intelhda        db 'INTEL_HDA', 0
+intelhda        db 'HDAUDIO', 0
 sb16            db 'SB16', 0
 
 msgInit         db 'Detecting hardware...',13,10,0
diff --git a/programs/cmm/dicty/dicty.c b/programs/cmm/dicty/dicty.c
index fa30104c3c..95ec1e487e 100644
--- a/programs/cmm/dicty/dicty.c
+++ b/programs/cmm/dicty/dicty.c
@@ -117,7 +117,7 @@ void DrawLangButtons()
 	int y = edit1.top+3;
 	DrawBar(Form.cwidth-111, y, 100, 25, sc.work);
 	DefineButton(Form.cwidth-79, y-4, 20, 20, BTN_CHANGE_LANGUAGE, sc.button);
-	WriteText(Form.cwidth-73, y-1, 10000001b, sc.work_text, "\26");
+	WriteText(Form.cwidth-73, y-1, 10000001b, sc.button_text, "\26");
 	if (active_dict == ENG_RUS) {
 		direction = TEXT_RU2EN; 
 	} else {