From 4638927f134f133aff3875513188e38dee17be60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomek=20W=C3=B3jcik?= <labs@tomekwojcik.pl>
Date: Sat, 25 Feb 2023 14:41:47 +0100
Subject: [PATCH] [SniffEmu] v1.1.0

---
 SniffEmu/README.md                  |  15 +++++++++++----
 SniffEmu/SniffEmu/Readme            |  13 ++++++++++---
 SniffEmu/SniffEmu/SniffEmu          | Bin 9036 -> 9240 bytes
 SniffEmu/SniffEmu/Source/SniffEmu.c |  17 +++++++++++++++--
 SniffEmu/SniffEmu/Source/SniffEmu.h |   8 ++++++--
 SniffEmu/dist/SniffEmu.readme       |  18 +++++++++++++-----
 6 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/SniffEmu/README.md b/SniffEmu/README.md
index 636a0af..dabc76b 100644
--- a/SniffEmu/README.md
+++ b/SniffEmu/README.md
@@ -1,6 +1,6 @@
 # SniffEmu
 
-CLI tool to "detect" if the system is running in emulator
+Amiga CLI tool to "detect" if the system is running in emulator.
 
 ## Description
 
@@ -8,12 +8,15 @@ SniffEmu is a small CLI tool to "detect" if the system is running in
 emulation-like environment, e.g. UAE. I use it to conditionally execute parts
 of Startup-Sequence, e.g. to can skip FBlit when the OS is booting on PiStorm.
 
-Usage: SniffEmu HELP/S RTG/S MODE
+Usage: SniffEmu HELP/S RTG/S SND/S MODE
 
 `MODE` is one of `EMU68`, `UAE` or `MUSASHI`. `RTG/S` allows you to
 specifically look for the emulator's RTG card, so you can e.g. set up the
 proper screen mode.
 
+`SND/S` allows you to look for the emulator's sound card. This currently works
+only with `UAESND` card in WinUAE.
+
 Example:
 
 ```
@@ -47,6 +50,10 @@ AmigaOS 3.1+, MC68020+
 
 ## Changelog
 
+Version 1.1.0 (25.02.2023)
+
+  * Added sound card detection.
+
 Version 1.0.0 (16.02.2023)
 
   * Initial release.
@@ -58,8 +65,8 @@ me through e-mail.
 
 ## Author
 
-ScreenSaver is developed by [Tomek Wójcik](https://www.bthlabs.pl/).
+SniffEmu is developed by [Tomek Wójcik](https://www.bthlabs.pl/).
 
 ## License
 
-ScreenSaver is licensed under the MIT License.
+SniffEmu is licensed under the MIT License.
diff --git a/SniffEmu/SniffEmu/Readme b/SniffEmu/SniffEmu/Readme
index 6898bcd..e574e97 100755
--- a/SniffEmu/SniffEmu/Readme
+++ b/SniffEmu/SniffEmu/Readme
@@ -4,11 +4,14 @@ SniffEmu is a small CLI tool to "detect" if the system is running in
 emulation-like environment, e.g. UAE. I use it to conditionally execute parts
 of Startup-Sequence, e.g. to can skip FBlit when the OS is booting on PiStorm.
 
-Usage: SniffEmu HELP/S RTG/S MODE
+Usage: SniffEmu HELP/S RTG/S SND/S MODE
 
 MODE is one of EMU68, UAE or MUSASHI. RTG/S allows you to specifically look
 for the emulator's RTG card, so you can e.g. set up the proper screen mode.
 
+SND/S allows you to look for the emulator's sound card. This currently works
+only with UAESND card in WinUAE.
+
 Example:
 
 > SniffEmu EMU68
@@ -17,8 +20,8 @@ SniffEmu: Looking for board: 28019:-1... NOT FOUND
 > SniffEmu RTG UAE
 SniffEmu: Looking for board: 2011:96... FOUND
 
-If the emulator (or RTG) was detected, the program will set the returncode to
-WARN. Otherwise, it'll be OK.
+If the emulator (or RTG/SND) was detected, the program will set the returncode
+to WARN. Otherwise, it'll be OK.
 
 Example script:
 
@@ -39,6 +42,10 @@ SniffEmu is licensed under the MIT License.
 Changelog
 ---------
 
+Version 1.1.0 (25.02.2023)
+
+  * Added sound card detection.
+
 Version 1.0.0 (16.02.2023)
 
   * Initial release.
diff --git a/SniffEmu/SniffEmu/SniffEmu b/SniffEmu/SniffEmu/SniffEmu
index 983572fca340367c59645a2cd57d828ad8f14b28..7bf86104e819e4b70c5431e13bf6d314f2b6a66d 100755
GIT binary patch
delta 1521
zcmZuvU1$_n6uvXFJ3D_nbMG3G>`%5gn<Xykb~mP)#$bbqN!%`R6QT`kv1O8`n~3RV
zYc`7wp$VZ#34I7&OGSf-gqn)jZ8k_7gh~)8B7G9^K`a!p)`!{$NqvaeGn175;J|n9
zIrn_$yK~Puw>nQH=E{Ro3?XCy-U0{!2fzj9ZwN`ReY^b!fqTTB3bcYOCMM8e>U)G_
zGl#mLAT2e%Ew+ul>KGOFr`p+<j#fYH)cTs~{_NpQhUSMqpkt%s*+Kd~yX`p0V$Oh0
z7TYd>(n(t>!P3q^og5ACwgjn?d6aV&XEHhv=*Cs)Zc_u#x8bp~&UdHoC4Oz8(Ky<D
z3{AW!yvT9I<0FWhNgPAC?LzAl6pl+aTeH1rTuMyvE!K(jhkZ{aRfZ7PlKch*hLnEv
z{B#7FhzsRWd?&nJqoW9NZ2q;L?&NgFk>|{m9m7^E`M)4<HrT<kmm~^ic|49H@PIW-
zkSxM=(Fg+BnIVLVY*ma*6^_84(4jhb$4tgi2%EtiZ(F8WmJ>Fsv24G{EF6J)B!C|t
zYP0!eAbo2iR=W%S{sqJ%cD_;vzBg0g%}QIv1I(NMWyXcLv;PhB{JQl=am5Nsmq5Ux
zZi@D!^>-o&&P1?!B8WP=es)Ykv%;*;W$xY6pWT|LV|KHx=8tA+$G*24n`m=HLC7A0
zjt|G1=}UO~#>e`{h7a3J_O+|N2J++kqx-tsJ5ac<qjz(LAf3XP#p-FKVMpni>rD>k
zu~Clk#sQX*O<rAKKgxT!b*3r9)>%RMf_uO;HNxw8)~E(~cMt1R8+dKGG^=KXkh)NF
z4eBJpwAd52>1+S^C7)5`8p&X~J2f6x!lOundC@k?qpU+IYQrCcLK&O}a{RT6sB%d8
zJ9>gdcygW9krYqc*#w#3Uuk7)q|MrzJqN69&SQC{+n!~C4|cKH@)+;$DXo;dc<w1%
zt=tQ%;%$Ys%lkU4)7~AhUa{@R-mPGJd}p8pmwmB7RZ|Ei7p;Z_t95}TXb%^1S$0(u
zd*;jXRZXQ~e;3CGmP%IwVNMGy{fqFhYQ!QO2o7_t6l6F`cUo&|JoOPmbPjM5a0)OF
zI0sk&ECMb8ih$**%`e6{T0Ldu34fv_LVP2?OGpV<h5ODX@x1WJIq95rIb770bmg7x
z&H)jNA+cA?inFead_!JS(#pIls`Kg%^`Yi73dXE)+PG-kA&1COGDlWCis!iJ<`%kT
zu)<f7^!9pBd++(MuhTc-JMVAtXZ@e~pZTXIt2%=t!9wr>O;M8$(qTG6b2Lwn(MdW@
zKSf&+hcJIxDoSf|m$Iz(X*aan?lO11yT$#Ud&GUty{e0PnV!%O=`;GAeo6mbUpI6k
zWW<c!M%s8_tQqUL3Fk4z4fqhwB8+(MjxZn`6+6X&a`6-Ogu0}zsCPBVe>HfKcG6y&
zX0hsugGsqw&dHz4XXWpVIpdsBG**mN<EC-nc#IY7!?m~*_u&CNgHPaj{1q<Z6?`54
zgzw^C@H*j%LNKW$K~hViWIJgg3DQQo$Rt^2XRD*Sl!u9iMoG{lX`yttI>zzFG?QwA
Nq6&Q^X%?-ae*u^%meK$K

delta 1367
zcmZuxZ)g)|7=P|Ams~HGd*9YloAi=9Vu;x$N$WD1&IQe^i&9gUZ4!h@I!fxFu8qT%
zEJ#|4h{%w_+l}Ii^g~f8rRz*TI1yLG52g5Flu|k=u86R#6dXY|akcKb#IZ4U@O%Ee
z&+|U-J<sp%9gf}KKUn9ntpfl-96$&N3&Muxuc-d~F8qVQ-D6J$V>4Ze<)A(OJ%BWv
zfz~IW#Cw{8jqD9eHygD?*bB?Y>;uuQ(v|2n%p59b_Or91_PW&W+hcAp<a9A3P7S10
zOfV{?lC3EPJy*qJcg0WoR${+IjBO#<-3z&w*_Rn^>U<|~J7QT-qSy950bfWeXYVU}
z+d@(-$6YC}1j^^s8*&Fg>EO4Zb;xb-;*K9u0E=fJv=e(%jBW^2D%hSKZavtaww&Qo
z@p6osvDkltd}@0+So=R4g;ZTA1U_tF+<XDLg2x^91C|}=XlF%hpf7t0-^1t#U>5^v
zOV*e2Wcad`O4VkBSF<=-={|cZ*&4Eh#5UNVW|5F=uG=2tjB4<RY$dA=*5~|yYgV*o
z{9p(zKU>b?e2sX|hg~Pq>E_RRb{Pk{dfPfrw6mXVhgeS9q91DA*9`H~z9Y?vUB=&O
z1`-%-Gy+XK3NzBX9A~hNsvxg^$%1l<mzUX~{GJ%blM*ave~oeWcg$GC{uQUO1$%&Z
zOt1~RhgU8zkFuS&uN4wXm*AC`x6I(2CFHBj@he~X$1gl0Q(QeANw&s&Lb9(LBxFpf
zbSsD1c(t1gv)SqZPuE$gI?n57S+pj{d%j?IYNDp%H+^KP<R;TAjBJ_~c=tJ$*c{|t
z7YYNLZ9KP)U39*Wa^ATYWv%N?lrh&^DD!3ehHER@4_x11&%F&nP0M)AkL0dbFo)c*
z8UTay+Du!^u$hJ~Udt33wHA(VSS{q;K2B*^{a3=Ir_)T(^yA#y`Y-@z7&}cF?}?uV
z&}R|%5kDdp5KD+<#0uguqKH^yw~eO07y!S6-z~(2+rmS!)|wZJVp2?7AKEOUAx6YC
zal;z49<-*dze`9})nL_v9FZ4fq`{t0C)K;^y!wc!bcl}ASz4-&R^O@NYmzl1b&0xx
z`iu4R&RS>8nRniBK5+HAuDWI#8eP*`-aY1?^l19|K7Cjp(MR<${klG(PwCV8P5m}(
z1r8`bX)8)W>0H&Ce969{C`yZRT<KN5R>qVi<+&r`XmRvAh8(vXvyR8AUk$7K)uU=!
z&8mY$BS8`-88ShV<Rlp)SAhc0Eef9spIg1wi1nyEC$GvSJGJ-iaXocE()0R7eGqsM
zgv-JxYKu@OXb=QZI4Sz2<I;8Mp0p_arp~HMYEdnz&k0ZJh?hi3f*d1xa*13fx5yk>
zAP-5Al*l@@Qc7JkOn1>JjnTvO2t7vIX(#Qa{WM3<(P_E{_^>W-K($TaKZjJ=kS5!5
lVayxk{OV1-5&ytBRPIL*O6aemXWp1RfQ%H=LH2Bm@fW8%biDuo

diff --git a/SniffEmu/SniffEmu/Source/SniffEmu.c b/SniffEmu/SniffEmu/Source/SniffEmu.c
index bb449f9..1bf65bc 100755
--- a/SniffEmu/SniffEmu/Source/SniffEmu.c
+++ b/SniffEmu/SniffEmu/Source/SniffEmu.c
@@ -39,11 +39,12 @@ static char *MODE_NAME_EMU68 = "EMU68";
 static char *MODE_NAME_UAE = "UAE";
 static char *MODE_NAME_MUSASHI = "MUSASHI";
 
-#define TEMPLATE "HELP/S,RTG/S,MODE"
+#define TEMPLATE "HELP/S,RTG/S,SND/S,MODE"
 
 typedef enum {
     OPT_HELP,
     OPT_RTG,
+    OPT_SND,
     OPT_MODE,
     OPT_COUNT
 } OPT_ARGS;
@@ -65,10 +66,11 @@ int help() {
 
     printf(
         "\n"
-        "Usage: SniffEmu HELP/S RTG/S MODE\n"
+        "Usage: SniffEmu HELP/S RTG/S SND/S MODE\n"
         "\n"
         "HELP    : Print this help\n"
         "RTG     : Sniff the RTG board\n"
+        "SND     : Sniff the sound card\n"
         "MODE    : Specify the emulator to sniff\n"
         "          Valid values: EMU68, UAE, MUSASHI\n"
     );
@@ -145,6 +147,17 @@ int main(int argc, char *argv[]) {
                             printf("SniffEmu: Can't reliably sniff RTG on Musashi :(\n");
                             product = MUSASHI_RTG;
                         }
+                    } else if (opts[OPT_SND]) {
+                        if (mode == MODE_EMU68) {
+                            printf("SniffEmu: Can't sniff SND on EMU68 :(\n");
+                            product = EMU68_SND;
+                        } else if (mode == MODE_UAE) {
+                            manufacturer = UAE_SND_MANUFACTURER;
+                            product = UAE_SND;
+                        } else if (mode == MODE_MUSASHI) {
+                            printf("SniffEmu: Can't sniff SND on Musashi :(\n");
+                            product = MUSASHI_SND;
+                        }
                     }
 
                     result = find_board(manufacturer, product);
diff --git a/SniffEmu/SniffEmu/Source/SniffEmu.h b/SniffEmu/SniffEmu/Source/SniffEmu.h
index 9015fc8..2ee7662 100755
--- a/SniffEmu/SniffEmu/Source/SniffEmu.h
+++ b/SniffEmu/SniffEmu/Source/SniffEmu.h
@@ -1,17 +1,21 @@
 #ifndef __SNIFFEMU_H__
 #define __SNIFFEMU_H__
 
-#define VERSION "1.0.0"
-#define DATE "16.02.2023"
+#define VERSION "1.1.0"
+#define DATE "25.02.2023"
 
 #define APP_VSTRING "$VER: SniffEmu " VERSION " (" DATE ")"
 
 #define EMU68_MANUFACTURER       (0x6d73)
 #define EMU68_RTG                (0x24)
+#define EMU68_SND                (0xff)
 #define UAE_MANUFACTURER         (0x7db)
 #define UAE_RTG                  (0x60)
+#define UAE_SND_MANUFACTURER     (0x1966)
+#define UAE_SND	                 (0x02)
 #define MUSASHI_MANUFACTURER     (0x7db)
 #define MUSASHI_INTERACTION      (0x6b)
 #define MUSASHI_RTG              (0x6b)
+#define MUSASHI_SND              (0xff)
 
 #endif
diff --git a/SniffEmu/dist/SniffEmu.readme b/SniffEmu/dist/SniffEmu.readme
index 08d6b71..42edbc3 100644
--- a/SniffEmu/dist/SniffEmu.readme
+++ b/SniffEmu/dist/SniffEmu.readme
@@ -1,8 +1,8 @@
-Short:        CLI tool to "detect" if the system is running in emulator
+Short:        Check if system is running in emulator
 Author:       Tomek Wójcik <contact@bthlabs.pl>
 Uploader:     Tomek Wójcik <contact@bthlabs.pl>
 Type:         util/sys
-Version:      1.0.0
+Version:      1.1.0
 Architecture: m68k-amigaos
 Requires:     AmigaOS 3.1+, MC68020+
 
@@ -12,11 +12,14 @@ SniffEmu is a small CLI tool to "detect" if the system is running in
 emulation-like environment, e.g. UAE. I use it to conditionally execute parts
 of Startup-Sequence, e.g. to can skip FBlit when the OS is booting on PiStorm.
 
-Usage: SniffEmu HELP/S RTG/S MODE
+Usage: SniffEmu HELP/S RTG/S SND/S MODE
 
 MODE is one of EMU68, UAE or MUSASHI. RTG/S allows you to specifically look
 for the emulator's RTG card, so you can e.g. set up the proper screen mode.
 
+SND/S allows you to look for the emulator's sound card. This currently works
+only with UAESND card in WinUAE.
+
 Example:
 
 > SniffEmu EMU68
@@ -25,8 +28,8 @@ SniffEmu: Looking for board: 28019:-1... NOT FOUND
 > SniffEmu RTG UAE
 SniffEmu: Looking for board: 2011:96... FOUND
 
-If the emulator (or RTG) was detected, the program will set the returncode to
-WARN. Otherwise, it'll be OK.
+If the emulator (or RTG/SND) was detected, the program will set the returncode
+to WARN. Otherwise, it'll be OK.
 
 Example script:
 
@@ -47,6 +50,11 @@ SniffEmu is licensed under the MIT License.
 Changelog
 ---------
 
+Version 1.1.0 (25.02.2023)
+
+  * Added sound card detection.
+
 Version 1.0.0 (16.02.2023)
 
   * Initial release.
+