From a9df4946795a7d5266331714def6cfb302f80576 Mon Sep 17 00:00:00 2001 From: Heiko Date: Sun, 4 Oct 2020 22:02:49 +0200 Subject: [PATCH] [ADD] Amiga installer script added --- A1200PlusNetworkDriver.readme | 18 ++-- DistributionTemplate/Folder.info | Bin 0 -> 628 bytes DistributionTemplate/Install | 148 +++++--------------------- DistributionTemplate/Install.info | Bin 1266 -> 1279 bytes DistributionTemplate/Roadshow.info | Bin 628 -> 628 bytes DistributionTemplate/install-old | 22 ---- DistributionTemplate/install-old.info | Bin 894 -> 0 bytes DistributionTemplate/network.info | Bin 0 -> 628 bytes KSZ8851/devicedriver/makefile | 9 +- KSZ8851/servicetool/makefile | 11 +- makefile | 4 +- tools/create_lha_distribution.sh | 15 +-- tools/lxamiga.pl | 3 +- 13 files changed, 51 insertions(+), 179 deletions(-) create mode 100644 DistributionTemplate/Folder.info delete mode 100644 DistributionTemplate/install-old delete mode 100644 DistributionTemplate/install-old.info create mode 100644 DistributionTemplate/network.info diff --git a/A1200PlusNetworkDriver.readme b/A1200PlusNetworkDriver.readme index b17bf9d..6098ad2 100644 --- a/A1200PlusNetworkDriver.readme +++ b/A1200PlusNetworkDriver.readme @@ -10,29 +10,25 @@ Architecture: m68k-amigaos DESCRIPTION: This is a SANA-2 Amiga network device driver for the Amiga1200 Plus - build-in network chip ("KSZ8851"). You can always get the newest version - from: + build-in network chip ("KSZ8851"). You can get the source or the + newest version from: https://github.com/MOS6510/Driver-AmigaOS-KS8851 - You may also want to look on the pages of the Amiga1200 Plus project: + + You may also want to look on the pages of the great Amiga1200 Plus project: http://www.amigaclub.be/projects/amiga1200plus INSTALLATION: - Execute the small Amiga shell script "install" from Workbench which - copies anything to the right place or copy it manually: + Execute the installer script from Workbench or copy all files manually: network/ksz8851.device.020 => devs:networks/ksz8851.device - ksz8851.config => env:sana2/ - ksz8851.config => envarc:sana2/ - + ksz8851.config => envarc:sana2/ + env:sana2/ - The packages comes with a Roadshow Stack configuration files. - If you want to use it, you also need to copy 2 additional files (or use - the install script): + The package also comes with a Roadshow TCP stack configuration file: ksz8851 => devs:NetInterfaces/ksz8851 ksz8851.info => devs:NetInterfaces/ksz8851.info diff --git a/DistributionTemplate/Folder.info b/DistributionTemplate/Folder.info new file mode 100644 index 0000000000000000000000000000000000000000..caa27d9ecd26238b2f2f3b07491c67f71352aecb GIT binary patch literal 628 zcmZvaze)o^5XQf~talMa4=YI}l0pRk5Ydq8E@)w?gVI6Mea9}-e)E~PG=7gIeeYbWcvX3Gau=L?D!U-L3$i+FTsyn`ZNJhtyU_pu literal 0 HcmV?d00001 diff --git a/DistributionTemplate/Install b/DistributionTemplate/Install index 5e075ce..69eadb1 100644 --- a/DistributionTemplate/Install +++ b/DistributionTemplate/Install @@ -1,54 +1,36 @@ -; Installer for Etherbridge Device. -; Copyright (c) 2019 Heiko Pruessing. -; $VER: "Install Etherbridge" 2.01 (26.1.2019) +; Installer script for Amiga1200 Plus Network Device Driver ("ksz8851"). +; Copyright (c) 2020 Heiko Pruessing. +; $VER: "Install ksz8851 network device driver" 1.0 (03.10.2020) ; ----------------------------- CONSTS ---------------------------------------- -(set #current_version "2.01") +(set #current_version "1.0") -(set #dev-name "etherbridge.device") +(set #dev-name "ksz8851.device") (set @default-dest "RAM:") -(set #pc-install-path "C:\\ETHBRDGE") -(set #config_file_env "env:sana2/etherbridge.config") -(set #config_file_envarc "envarc:sana2/etherbridge.config") +(set #config_file_env "env:sana2/ksz8851.config") +(set #config_file_envarc "envarc:sana2/ksz8851.config") +(set #src_dev_name "network/ksz8851.device.020") (set #msg-os-too-low "AmigaOS 2.04 or greater is required.") -(set #msg-janus-too-old "Janus Software 2.1 required. Please install the newest Janus software first and run again.") -(set #msg-no-mui-installed "No MUI found! MUI is needed by the configuration program 'EtherPrefs'. You may install the device without EtherPrefs.") (set #msg-help-copy-lib "Copy the SANA2 Network Device Driver to the system.") (set #msg-final-installed (cat "Installation complete!\n\n" - "Etherbridge 2.0 is on your system!\n\nMay the force be with you! :-)\n" + "ksz8851 device driver 1.0 is on your system!\n\nMay the force be with you! :-)\n" ) ) (set #wrongversion -(cat "You have an old version of the program 'Installer' " - "on your Amiga!\n\nThe installation procedure needs at least Installer 42.9.\n\n" - "Please check your configuration!" +(cat "You have an old version of 'Installer' installed." + "\n\nThe installation procedure needs at least Amiga Installer 42.9.\n\n" + "Please check your configuration and try again!" )) -(set #msg-install-pc-parts - (cat "Now the PC parts of Etherbridge will be installed on your PC in path\n\n " - #pc-install-path "\n\n" - "For this, Janus 'AREAD' command must be in path on PC side. " - "Be sure your PC had finished booting and no other program is currently running on! " - "Depending on your Bridgeboard this will take some time (1-2 minutes)! " - "Do not break up!" - "\n\n" - "Click 'YES' if ready or 'NO' to skip" - ) -) - -(set #msg-install-pc-parts-help - (cat "Some files will be copied to PC path '" #pc-install-path "' The janus tool AREAD must be present on path. If not please install manually, check documentation." ) -) - -(set #intro (cat "\nEtherbridge Network Driver " #current_version - "\n====================================\nİ 1997-1999,2013,2019 Heiko Prüssing\n\n" - "Welcome to the installation program of Etherbridge.\n" - "Use this tool to install Etherbridge on your system or to update a previously installed release.") +(set #intro (cat "\nAmiga1200 Plus Network Device Driver " #current_version + "\n====================================\n(c) 2019 Heiko Pruessing\n" + "Welcome to the installation program of Amiga1200 Plus network device driver ('ksz8851.device'). " + "Use this tool to install the device driver on your Amiga system or to update a previously installed release.") ) @@ -64,82 +46,47 @@ ) ) - ; Check OS version isn't too old (if (< (/ (getversion) 65536) 37) (abort #msg-os-too-low) ) -; Check right version of Janus Library. Should be latest V36.83 -(set vernum (getversion "sys:expansion/janus.library")) -(if (< vernum 2359379) ; => last version from Commodore: V36.83 - (abort #msg-janus-too-old) -) - -;Check that MUI is installed. Needed by the config program EtherPrefs. -(if (< (getversion "LIBS:muimaster.library") 917611) ; V14.107 - (abort #msg-no-mui-installed) -) - (complete 0) ; ###### Install Files ######## -;Install EtherPrefs to sys:Prefs -(copyfiles - (prompt "Copying the configuration application.") - (help @copyfiles-help) - (source "prefs") - (dest "SYS:Prefs") - (pattern "EtherPrefs#?") - (files) - (confirm) - (infos) -) - ; ; Install Device -; Pick the right CPU device and copy it to the destination... -(set installed_cpu (database "cpu") ) -(set #default_cpu_choice 0) -(if ( >= installed_cpu "68020") (set #default_cpu_choice 1) ) -(if ( >= installed_cpu "68040") (set #default_cpu_choice 2) ) -(if ( >= installed_cpu "68060") (set #default_cpu_choice 3) ) -(set #devicetype - (askchoice - (choices "68000" "68020" "68040" "68060") - (prompt "Select processor optimized device version (default: The installer chooses the best for your system)") - (help "Some processor optimized devices are available. Pick the right one you want to use.") - (default #default_cpu_choice) - ) -) -(set #src_dev_name (select #devicetype "000" "020" "040" "060") ) -(set #src_dev_name (cat "devs/networks/etherbridge.device." #src_dev_name) ) -(debug #src_dev_name) +; (copylib (prompt "Installing the network device driver.") (help @copylib-help) (source #src_dev_name) (dest "DEVS:networks") - (newname "etherbridge.device") + (newname "ksz8851.device") (confirm) ) +(complete 30) + ; Copy new default configuration file(s) only if none exists (if ( = (exists #config_file_env) 0 ) ( (copyfiles - (source "envarc/sana2/etherbridge.config") + (source "ksz8851.config") (dest "env:sana2") (optional "force" "askuser") (confirm) ) ) ) + +(complete 60) + (if ( = (exists #config_file_envarc) 0 ) ( (copyfiles - (source "envarc/sana2/etherbridge.config") + (source "ksz8851.config") (dest "envarc:sana2") (confirm) (files) @@ -147,9 +94,9 @@ ) ) -(complete 40) +(complete 90) -; Install Roadshow configuration +; Install Roadshow configuration if present (if ( = (exists "Devs:NetInterfaces" (noreq) ) 2 ) ( (copyfiles @@ -165,47 +112,6 @@ ) ) ) - - - -; -; Install PC part -; -(complete 50) -(if (askbool (prompt #msg-install-pc-parts) (help #msg-install-pc-parts-help) (default 1)) - ( - (copyfiles - (prompt (cat "Install the PC files to " #pc-install-path) ) - (help @copyfiles-help) - (source "pc") - (dest "T:pc") - (pattern "#?") - (files) - ) - (complete 85) - ; Run the command to install all... - (set #installpccmd (cat "runpccmd \"aread T:pc/~(#?.BAT) " #pc-install-path " /b\"") ) - (run #installpccmd ) - ;Wait/delay until command is finished... - (run ( cat "runpccmd \"dir " #pc-install-path " \"") ) ; send Space + LF only - ) -) -(complete 90) - - -; -; Start EtherPrefs (default) at the end of the installation -; -(set #start_etherprefs - (askbool - (prompt "Do you want to configure Etherbridge now?\n('SYS:Prefs/EtherPrefs' will be started...)") - (help "The config program will be started ('SYS:Prefs/EtherPrefs').") - (choices "Start EtherPrefs now" "No, configure later") - (default 0) - ) -) -(if (= #start_etherprefs 1) (execute "executePrefs.ash") ) - ; ; Finish Installation diff --git a/DistributionTemplate/Install.info b/DistributionTemplate/Install.info index e208b5fff69ae0187e8c4c61558ee361409c1226..ee11daf52440e0621f26cdc130a95b854d7fc00b 100644 GIT binary patch delta 153 zcmeyw`JXfPu>b=j0|;m{h%)E^Asdj-C}2OOK)`b=j0|@9dh%)E^Asdj-$j(w)!Oq@h0hU1~7+DzDnLmGEXYWh^3Tp!~ z7eZQH0L%uN!ob=j0|+!R1Tt7M@G-D4Ff%X;s54{$@dvOBGQr5i2IDpW86YfRzm;R6 Wn>RC~ZN|hYADJ2LJSKNAz5xJDhYp

b=j0}wDyXYgRKWZ+|9V_;@rWM^@Iz|P|N0wjY17?~One8x&3+m@ZJ XBx9nRH#4(3!^9~cfz*S^9gJ@Pe3B1m diff --git a/DistributionTemplate/install-old b/DistributionTemplate/install-old deleted file mode 100644 index 9226a98..0000000 --- a/DistributionTemplate/install-old +++ /dev/null @@ -1,22 +0,0 @@ -; Q&D Install script for Amiga 1200+ ksz8851 network device driver -; Roadshow MUST be installed first! - -ask "Amiga1200+ Network driver will now be installed! Continue (y/n)?" -IF WARN -echo "### Amiga 1200+ Network Driver ksz8851 Installation ###" -echo "Copy network device and config" -copy :network/ksz8851.device.020 to devs:networks/ksz8851.device -copy :ksz8851.config to env:sana2/ -copy :ksz8851.config to envarc:sana2/ - -;Roadshow: -echo "Copy configuration for Roadshow TCP Stack..." -copy :ksz8851 to devs:NetInterfaces/ksz8851 -copy :ksz8851.info to devs:NetInterfaces/ksz8851.info - -echo "Installtion complete!" -echo "You may start Roadshow now with 'c:AddNetInterface ksz8851'." - -else -echo "Installation skipped!" -endif \ No newline at end of file diff --git a/DistributionTemplate/install-old.info b/DistributionTemplate/install-old.info deleted file mode 100644 index 179d3444abf5beac125ed594bc724bdb234618ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 894 zcmZuvJxjw-6uq&ff^-OiU*OOoDCqE_v>k*(OLYiHQ?MmMM<<824hn7!{)7(d4{(Zu zPIc_;rj80K_y-*86wiA}n#ZLtc|G@>dvf1>m;RV!kX&ncinKyG%8+4N3#-_+%IH5v zmdvfIb<@fhAunNP({v#Ui?mF0M6b7*G&POPIEvAqfkwOC(sl4E<4wkSp7gvtQRhY& zh6$&%p8@1B{3Qjzp=06o=}rX&dfr54u}VW1DD@kl1AQY1?sfe-2*y%R{EZ-ZVE!@l zt2&9F*SFBW^s|0^$kP?i{B07=Jh?-J-|?M*6MPZQz(34f*TJidHyP*onRO@ed8!eu zkC^+@3q(P8^nv$`Ix2Xf@)wNVN9sNSJJ9>UGW1W(T-SS;xzrQ?2s3B?G4rcBiJ#Yh zM?ccf`WfJO`5(c`ou2f2momy@&wDkeRVhij?KzEo*Q?as#-1%owh%kJws7D+7PX7> NzK~W?KXi`{=pP)>N3#F` diff --git a/DistributionTemplate/network.info b/DistributionTemplate/network.info new file mode 100644 index 0000000000000000000000000000000000000000..1d0cb90bc48e64eef72ef29980190103e06675e6 GIT binary patch literal 628 zcmZvaKTE?<6va={m{$B3oWx0_I5=9Q*(-?lvDqH|gvw-CbOSYzm4W zp=KyP?>R4NGvq?v@80w7y^njzSAqbv72M+l>xj`pkgT1*C3}ybx~U&QnAgI#`M1gN zE}3gR^ze!o=ct6(9NFzPed~Bi%5HGx%n;b|Q;B*#L@=1N<`SI^rn+yeN{!GFyT)a= z1M%In1JAabNM~Z#vV6VD5S9IAKCGRo@(LVC+rnWP_r)B2H^qk&_dS1|XMt2Y6LTDw z^{MKL+6xUXH*PZzADU<09@Cz2bV<9yNIhp5s8v)lHgXrD?IO+wwjEFIf-x=5eEnY* qs_!^U)o(HLuJk7?>Aee8@u>0^read_const_time(1000); $serial->read_char_time(350); +# $serial->read_char_time(1000); my $read = $serial->read($len); print "="x73,"\n" if $args{v}; print "RECEIVED ".(length($read))."/$len BYTES:\n" if $args{v};