wd_fdc: Set CRC error bit if CRC error found during Read Address command. Tiki 100 determines whether the disk is in FM or MFM format by checking this. [Curt Coder]

(MESS) tiki100: Fixed CPU clock and floppy interface. [Curt Coder]

hash/tiki100.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
 <!DOCTYPE softwarelist SYSTEM "softwarelist.dtd">
 <softwarelist name="tiki100" description="TIKI-100 Disk Images">
+
 	<software name="assist">
-		<description>Assistent</description>
+		<description>Assistent (Nor)</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -13,9 +14,9 @@
 	</software>
 
 	<software name="basic">
-		<description>Kontiki Basic</description>
+		<description>Kontiki-BASIC v1.1</description>
-		<year>198?</year>
+		<year>1982</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>R.T. Russell</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="92160">
 				<rom name="basic.dsk" size="92160" crc="8ee788e4" sha1="2856ae39544d781b1721c81089ba0be2315ec6d8" offset="0"/>
@@ -24,7 +25,7 @@
 	</software>
 
 	<software name="basis">
-		<description>Basis</description>
+		<description>Basiskunskap om Tiki-100 (Nor)</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -35,9 +36,9 @@
 	</software>
 
 	<software name="bjelker">
-		<description>Bjelker (Nor)</description>
+		<description>Boyepakjente Bjelker v1.02 (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Dimensjonering</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="bjelker.dsk" size="409600" crc="430c3224" sha1="22abd426965e0f8f68581a19ce25fadefbc5f1f6" offset="0"/>
@@ -46,9 +47,9 @@
 	</software>
 
 	<software name="brage">
-		<description>Brage (Nor)</description>
+		<description>BRAGE v1.3 (Nor)</description>
-		<year>198?</year>
+		<year>1986</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Gisle Hannemyr</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="brage.dsk" size="409600" crc="a15307a2" sha1="546eb9030eff0789327cec13aae8f3edfef31353" offset="0"/>
@@ -57,7 +58,7 @@
 	</software>
 
 	<software name="brok">
-		<description>Brøk (Nor)</description>
+		<description>Brøk v1.3 (Nor)</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -69,16 +70,18 @@
 
 	<software name="brum2">
 		<description>Brum-II (Nor)</description>
-		<year>198?</year>
+		<year>1985</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>H. Wiig</publisher>
 		<part name="flop1" interface="floppy_5_25">
+			<feature name="part_id" value="Program"/>
 			<dataarea name="flop" size="204800">
-				<rom name="brum-iid.dsk" size="204800" crc="b62be27b" sha1="1e8ec44ff452424a8e7e7f376cbba8947abe6f9c" offset="0"/>
+				<rom name="brum-iip.dsk" size="204800" crc="ac0a7384" sha1="43e0db5872613dc535c0c1ac9b0f41ee10c9fb16" offset="0"/>
 			</dataarea>
 		</part>
 		<part name="flop2" interface="floppy_5_25">
+			<feature name="part_id" value="Text"/>
 			<dataarea name="flop" size="204800">
-				<rom name="brum-iip.dsk" size="204800" crc="ac0a7384" sha1="43e0db5872613dc535c0c1ac9b0f41ee10c9fb16" offset="0"/>
+				<rom name="brum-iid.dsk" size="204800" crc="b62be27b" sha1="1e8ec44ff452424a8e7e7f376cbba8947abe6f9c" offset="0"/>
 			</dataarea>
 		</part>
 	</software>
@@ -95,9 +98,9 @@
 	</software>
 
 	<software name="conset">
-		<description>Conset (Nor)</description>
+		<description>Conset Oppsettingsprogram for Concept Keyboard (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Daisy</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="conset.dsk" size="409600" crc="add05b6a" sha1="c6a309bd29e13ef37fb4b44ec1a9144d68b8706f" offset="0"/>
@@ -107,8 +110,8 @@
 
 	<software name="dataflor">
 		<description>Dataflora (Nor)</description>
-		<year>198?</year>
+		<year>1985</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Gisle Hannemyr</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="dataflor.dsk" size="409600" crc="35abe5ec" sha1="66d28589da24b713355f8c4ba8e522d0a92d974b" offset="0"/>
@@ -117,7 +120,7 @@
 	</software>
 
 	<software name="dbase2">
-		<description>Dbase II v2.4</description>
+		<description>Dbase II v2.4 (Nor)</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -128,9 +131,9 @@
 	</software>
 
 	<software name="dgraf">
-		<description>Daisygraf (Nor)</description>
+		<description>Daisygraf v3.0 (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Daisy</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="dgraf.dsk" size="409600" crc="f3c77843" sha1="f40558f03fefcc2bd1e10a857cd76028c0d4b266" offset="0"/>
@@ -161,9 +164,9 @@
 	</software>
 
 	<software name="drlogo">
-		<description>Dr. Logo (Beta)</description>
+		<description>Dr. Logo for Tiki-100 v1.0b</description>
-		<year>198?</year>
+		<year>1983</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Digital Research</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="drlogo.dsk" size="409600" crc="e0b77156" sha1="4832dd628664f99b4fb084d74bfe0f811a1e3f62" offset="0"/>
@@ -183,9 +186,9 @@
 	</software>
 
 	<software name="dyr">
-		<description>Dyr (Nor)</description>
+		<description>Dyr i skogen (Nor)</description>
-		<year>198?</year>
+		<year>1990</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>LoM-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="dyr.dsk" size="204800" crc="f35e370e" sha1="ad466fff83ca8a74df3f5e74c100a776ec08cac9" offset="0"/>
@@ -196,7 +199,7 @@
 	<software name="engheis">
 		<description>Engelsk-heis (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Kjølshun-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="engelsk-heis.dsk" size="204800" crc="3a979612" sha1="6c22aa46e922d776d483321cfe293ab9d7ddb51b" offset="0"/>
@@ -207,7 +210,7 @@
 	<software name="engsvoop">
 		<description>Engelsk-svoop (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Kjølshun-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="engelsk-svoop.dsk" size="204800" crc="4a6762c3" sha1="e70bb846b544d96a0999fb2a71ab44a9b17cd2a6" offset="0"/>
@@ -217,8 +220,8 @@
 
 	<software name="eurogeo">
 		<description>Euro-geo (Nor)</description>
-		<year>198?</year>
+		<year>1985</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>L. Benestad</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="eurogeo.dsk" size="204800" crc="40f4a631" sha1="1bc724edf696adbaf0449429b46e6bee9ccea74c" offset="0"/>
@@ -227,9 +230,9 @@
 	</software>
 
 	<software name="europa">
-		<description>Europa (Nor)</description>
+		<description>Europa v1 (Nor)</description>
-		<year>198?</year>
+		<year>1990</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Kjølshun-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="europa.dsk" size="204800" crc="b110da59" sha1="550f41d2260fe1864d842741aef52b8fc7dc547f" offset="0"/>
@@ -239,8 +242,8 @@
 
 	<software name="farge">
 		<description>Farge (Nor)</description>
-		<year>198?</year>
+		<year>1990</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>LoM-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="farge.dsk" size="204800" crc="9d69062c" sha1="d87d6fa1bbab680c2c75699192c01932a5b4f962" offset="0"/>
@@ -249,7 +252,7 @@
 	</software>
 
 	<software name="feilfinn">
-		<description>Feilfinn (Nor)</description>
+		<description>Feilfinn v1.0 (Nor)</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -260,9 +263,9 @@
 	</software>
 
 	<software name="femten">
-		<description>Femten spillet (Nor)</description>
+		<description>Femten-Spill v1.2 (Nor)</description>
-		<year>198?</year>
+		<year>1986</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Datalauget</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="femten.dsk" size="409600" crc="202d5972" sha1="58459cc2d8a79918bb5fcf9f262af5abb6a9226a" offset="0"/>
@@ -293,9 +296,9 @@
 	</software>
 
 	<software name="flytte">
-		<description>Flytte (Nor)</description>
+		<description>Flytte-Tegne (Nor)</description>
-		<year>198?</year>
+		<year>1988</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>LoM-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="flytte.dsk" size="204800" crc="9f19c356" sha1="e72e7ae6959163f44db424da13bc1b2c3422fd8a" offset="0"/>
@@ -305,8 +308,8 @@
 
 	<software name="grammatk">
 		<description>Grammatikk (Nor)</description>
-		<year>198?</year>
+		<year>1990</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>LoM-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="grammatikk.dsk" size="204800" crc="6a8cf440" sha1="1276c0b99b1e3dd2c4eb704f998e2d54d9d3b13d" offset="0"/>
@@ -332,8 +335,8 @@
 
 	<software name="husk">
 		<description>Husk (Nor)</description>
-		<year>198?</year>
+		<year>1989</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>LoM-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="husk.dsk" size="204800" crc="b36acf06" sha1="67f36adee29470fd40f4b7aceefd69b1c4cc249c" offset="0"/>
@@ -342,9 +345,9 @@
 	</software>
 
 	<software name="invaders">
-		<description>Tiki-Invaders (Nor)</description>
+		<description>Tiki-Invaders v2 (Nor)</description>
-		<year>198?</year>
+		<year>1985</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Kim G.S. Oyhus</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="invaders.dsk" size="204800" crc="10a9a21a" sha1="5b6325248809fc356d5341f3698de1667dd9059c" offset="0"/>
@@ -354,8 +357,8 @@
 
 	<software name="jeg">
 		<description>Jeg (Nor)</description>
-		<year>198?</year>
+		<year>1989</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>LoM-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="jeg.dsk" size="204800" crc="2ea3ebcd" sha1="3aadf2bb3156350cc846b572c0902bc22bae9ef4" offset="0"/>
@@ -363,8 +366,8 @@
 		</part>
 	</software>
 
-	<software name="Kermit">
+	<software name="kermit">
-		<description>KERMIT (Nor)</description>
+		<description>Kermit-80 v4.05 (Nor)</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -386,9 +389,9 @@
 	</software>
 
 	<software name="kpm11">
-		<description>KP/M 1.1</description>
+		<description>KP/M 1.1 (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Orkim Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="kpm11.dsk" size="204800" crc="48980bb7" sha1="a7e36ffb782f2f88ca09657d2a6da69b02ab51e1" offset="0"/>
@@ -397,9 +400,9 @@
 	</software>
 
 	<software name="kpm115" cloneof="kpm11">
-		<description>KP/M 1.15</description>
+		<description>KP/M 1.15 (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Orkim Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="kpm115.dsk" size="204800" crc="9dc38eeb" sha1="8094d2d3591f8e74d6e3381dedee46954b9b3f9b" offset="0"/>
@@ -408,9 +411,9 @@
 	</software>
 
 	<software name="kpm117" cloneof="kpm11">
-		<description>KP/M 1.17</description>
+		<description>KP/M 1.17 (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Orkim Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="kpm117.dsk" size="204800" crc="435e8947" sha1="e4244954f8012ae66e747f2fbb7e220428b33a56" offset="0"/>
@@ -419,7 +422,7 @@
 	</software>
 
 	<software name="kryssord">
-		<description>Kryssord (Nor)</description>
+		<description>Kryssord Generator (Nor)</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -429,8 +432,8 @@
 		</part>
 	</software>
 
-	<software name="kud1v21">
+	<software name="kud">
-		<description>KUD 1 v2.1 (Nor)</description>
+		<description>KUD Programmepakke (Nor)</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -438,24 +441,12 @@
 				<rom name="kud1v21.dsk" size="409600" crc="fec1b3f7" sha1="ce32200182bc79ad973a546b5d12f52fc922ed29" offset="0"/>
 			</dataarea>
 		</part>
-	</software>
+		<part name="flop2" interface="floppy_5_25">
-
-	<software name="kud2v21">
-		<description>KUD 2 v2.1 (Nor)</description>
-		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
-		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="kud2v21.dsk" size="409600" crc="0fceb4d0" sha1="24feff6c1d3291846bf1352e1bca8fe33a179c76" offset="0"/>
 			</dataarea>
 		</part>
-	</software>
+		<part name="flop3" interface="floppy_5_25">
-
-	<software name="kud3v21">
-		<description>KUD 3 v2.1 (Nor)</description>
-		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
-		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="kud3v21.dsk" size="409600" crc="f7adeb75" sha1="12486da7fddf9bd2c012795eda09da11c8fd8bec" offset="0"/>
 			</dataarea>
@@ -464,8 +455,8 @@
 
 	<software name="legge">
 		<description>Legge sammen (Nor)</description>
-		<year>198?</year>
+		<year>1990</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>LoM-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="legge_sammen.dsk" size="204800" crc="1d74611b" sha1="be81607d73125b3ea7dee84f1443c35b0e8072f5" offset="0"/>
@@ -473,10 +464,10 @@
 		</part>
 	</software>
 
-	<software name="magnimst">
+	<software name="lese">
-		<description>Magnimaster (Nor)</description>
+		<description>Lesetreningsprogram med Hogfrekvente Ord v1.0 (Nor)</description>
-		<year>198?</year>
+		<year>1990</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Magnimaster</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="magnimaster.dsk" size="204800" crc="cc087c39" sha1="0826c0414731bc0def776c6cf51b70b1c359571c" offset="0"/>
@@ -487,7 +478,7 @@
 	<software name="matemat1">
 		<description>Matematikk 1 (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Kjølshun-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="matematikk1.dsk" size="204800" crc="289aee7f" sha1="f0c5164967e0355d852b4960ed7445ed7ffee6a1" offset="0"/>
@@ -498,7 +489,7 @@
 	<software name="matemat2">
 		<description>Matematikk 2 (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Kjølshun-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="matematikk2.dsk" size="204800" crc="047fc998" sha1="f32334938c4dd83b580ce5569e3b600f094fe92d" offset="0"/>
@@ -509,7 +500,7 @@
 	<software name="matemat3">
 		<description>Matematikk 3 (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Kjølshun-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="matematikk3.dsk" size="204800" crc="dd70c67c" sha1="d058d20f86c41b35a5f111f965c7e1e14f74683e" offset="0"/>
@@ -517,10 +508,10 @@
 		</part>
 	</software>
 
-	<software name="mattelom">
+	<software name="matte">
-		<description>Matte Lom (Nor)</description>
+		<description>Matte (Nor)</description>
-		<year>198?</year>
+		<year>1990</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>LoM-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="matte_lom.dsk" size="204800" crc="a90fbf24" sha1="48aa7642f584b3593a4b68816f6f8931bd2a69cf" offset="0"/>
@@ -528,10 +519,10 @@
 		</part>
 	</software>
 
-	<software name="matterog">
+	<software name="matematik">
-		<description>Matte Rogalandsdata (Nor)</description>
+		<description>Matematikk (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Rogalandsdata Programvare</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="matte_rogdata.dsk" size="204800" crc="444585d1" sha1="9f02ecfb1eeeecd675cb378ecbc6a965a67b3afc" offset="0"/>
@@ -540,9 +531,9 @@
 	</software>
 
 	<software name="mscopy">
-		<description>MS-Copy</description>
+		<description>MS-DOS - TIKO Filoverføring vC80 (Nor)</description>
-		<year>198?</year>
+		<year>1987</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Egel Kvaleberg</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="mscopy.dsk" size="204800" crc="a176faad" sha1="ff2a206deae5b8b5b87f360a27b59875880b067c" offset="0"/>
@@ -552,7 +543,7 @@
 
 	<software name="msdos">
 		<!-- 16 bit -->
-		<description>MS-DOS v2.11</description>
+		<description>MS-DOS v2.11 (Nor)</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -574,9 +565,9 @@
 	</software>
 
 	<software name="norgeo">
-		<description>Norgesgeografi (Nor)</description>
+		<description>Norge geografi-test (Nor)</description>
-		<year>198?</year>
+		<year>1985</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>L. Benestad</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="nor-geo.dsk" size="409600" crc="f560d885" sha1="ee713d046acf1189ed455c0c12b410f2ba674fbb" offset="0"/>
@@ -585,9 +576,9 @@
 	</software>
 
 	<software name="norskdag">
-		<description>Norsk dagros (Nor)</description>
+		<description>Norsk-dagros (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Kjolshunn-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="norsk-dagros.dsk" size="204800" crc="264582da" sha1="78662cebbf816035a99b0fcd7ea6cbe2c55fc1c3" offset="0"/>
@@ -596,9 +587,9 @@
 	</software>
 
 	<software name="norskgeo">
-		<description>Norsk geo heis (Nor)</description>
+		<description>Norsk geo-heis (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Kjolshunn-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="norsk-geo-heis.dsk" size="204800" crc="efcf3c34" sha1="cf4e559e0c68613965be9407fc4018a33d4b576c" offset="0"/>
@@ -607,9 +598,9 @@
 	</software>
 
 	<software name="norsktri">
-		<description>Norsk trim 1 (Nor)</description>
+		<description>Norsk-trim 1 (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Kjolshunn-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="norsk-trim_1.dsk" size="204800" crc="a9cf3faa" sha1="4aca2d7cd8d27631383c701fa9c0ff1946dd2bf2" offset="0"/>
@@ -618,9 +609,9 @@
 	</software>
 
 	<software name="norsklom">
-		<description>Norsk lom (Nor)</description>
+		<description>Norsk (LoM-Data, Nor)</description>
-		<year>198?</year>
+		<year>1988</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>LoM-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="norsk_lom.dsk" size="204800" crc="b80039cf" sha1="4382f13bad675ec4b92d21d0ca700bbe2007d208" offset="0"/>
@@ -629,9 +620,9 @@
 	</software>
 
 	<software name="norskrog">
-		<description>Norsk rogdata (Nor)</description>
+		<description>Norsk (Rogalandsdata Programvare, Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Rogalandsdata Programvare</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="norsk_rogdata.dsk" size="204800" crc="bf7cbf33" sha1="c46b2b027a3d71ce1e608677c9c3317d16009971" offset="0"/>
@@ -651,9 +642,9 @@
 	</software>
 
 	<software name="ofag">
-		<description>Ofag (Nor)</description>
+		<description>O-fag (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Rogalandsdata Programvare</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="ofag.dsk" size="204800" crc="93539e5f" sha1="9096bdae7be14b0f6544e7f24d0e84a2b150d571" offset="0"/>
@@ -662,9 +653,9 @@
 	</software>
 
 	<software name="oppgaver">
-		<description>Oppgaver (Nor)</description>
+		<description>Utskrift av Oppgaver (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>LoM-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="oppgaver.dsk" size="204800" crc="1c8e635b" sha1="c4007860f6b28309968a24203c094b9b3f128f3c" offset="0"/>
@@ -673,9 +664,9 @@
 	</software>
 
 	<software name="orac">
-		<description>Orac (Nor)</description>
+		<description>Utviklingspakke for Orac Dreiebenk (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Bache Maskin</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="orac.dsk" size="204800" crc="c3e5bfdd" sha1="b9dba9c8b8c4ee3d49609ccc4517470329bfeecb" offset="0"/>
@@ -686,7 +677,7 @@
 	<software name="ord1">
 		<description>Ord1 (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Kjolshunn-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="ord1.dsk" size="204800" crc="2c2f9f0d" sha1="c580fba7afdd6340289508db05d1320d16b7443a" offset="0"/>
@@ -697,7 +688,7 @@
 	<software name="ord2">
 		<description>Ord2 (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Kjolshunn-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="ord2.dsk" size="204800" crc="dbb0e0d9" sha1="ae5979d7045605c798f221da4600f41b05b096ba" offset="0"/>
@@ -706,9 +697,9 @@
 	</software>
 
 	<software name="ordklass">
-		<description>Ordklasser (Nor)</description>
+		<description>Ordklasser-II v1.2 (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Datalauget</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="ordklass.dsk" size="409600" crc="3ee6065e" sha1="100fd9f99656b9739a19e0ad9a2734c684000f94" offset="0"/>
@@ -740,8 +731,8 @@
 
 	<software name="rettulf">
 		<description>Rettulf (Nor)</description>
-		<year>198?</year>
+		<year>1986</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Datalauget</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="rettulf.dsk" size="409600" crc="3122e868" sha1="ae909a499fd1440fd7f4edd9ee64c87b0f14205e" offset="0"/>
@@ -749,10 +740,10 @@
 		</part>
 	</software>
 
-	<software name="rf">
+	<software name="refk">
-		<description>Ruteress og Formel (Nor)</description>
+		<description>Ruter Ess og formel-kalkulator (Nor)</description>
-		<year>198?</year>
+		<year>1989</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Anders Frederiksen</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="rf.dsk" size="409600" crc="fccdb425" sha1="9c081369a1947e189a455af835605987a1b5da39" offset="0"/>
@@ -761,9 +752,9 @@
 	</software>
 
 	<software name="skjuler">
-		<description>Skjul farger (Nor)</description>
+		<description>Skjulte Farger v2.5 (Nor)</description>
-		<year>198?</year>
+		<year>1986</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Datalauget</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="skjuler.dsk" size="409600" crc="05b632e0" sha1="10bf83274ce3a538752221ec7eeae7b98b18579d" offset="0"/>
@@ -794,9 +785,9 @@
 	</software>
 
 	<software name="tartist">
-		<description>TIKI-Artist (Nor)</description>
+		<description>Tiki-Artist v2.0 (Nor)</description>
-		<year>198?</year>
+		<year>1987</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Jan Vehusheia</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="tartist.dsk" size="409600" crc="17f0b19e" sha1="985e54ab31b7ae95498826e81b9916ecc3799068" offset="0"/>
@@ -807,7 +798,7 @@
 	<software name="tast">
 		<description>Tast (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Daisy</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="tast.dsk" size="409600" crc="6dc2fad5" sha1="0910994357da6792869c8aec3230e6664ff6177d" offset="0"/>
@@ -816,9 +807,9 @@
 	</software>
 
 	<software name="tegne">
-		<description>Tegne (Nor)</description>
+		<description>Tegneprogram (Nor)</description>
-		<year>198?</year>
+		<year>1988</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>LoM-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="tegne.dsk" size="204800" crc="08d82a87" sha1="0839c8373eeee4bda129580e04cbc3b6ab2de069" offset="0"/>
@@ -828,8 +819,8 @@
 
 	<software name="telle">
 		<description>Telle (Nor)</description>
-		<year>198?</year>
+		<year>1988</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>LoM-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="telle.dsk" size="204800" crc="f7d1031c" sha1="f1d9b85551762df309f6e0d8667e9b302bb4a70b" offset="0"/>
@@ -851,7 +842,7 @@
 	<software name="tkjer208">
 		<description>TIKO-Kjerne v2.08r (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Tiki-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="tiko208r-200k.dsk" size="204800" crc="81908dda" sha1="7f1e95924309368d1be112ec16fb6d85e2590bfc" offset="0"/>
@@ -876,9 +867,9 @@
 	</software>
 
 	<software name="timeplan">
-		<description>Timeplan (Nor)</description>
+		<description>Timeplanlegger v2.0 (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Marcus Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="timeplan.dsk" size="409600" crc="6338f616" sha1="194e4f769ce90552bbe906c1e781e80b71176c3e" offset="0"/>
@@ -889,7 +880,7 @@
 	<software name="tkjer401">
 		<description>TIKO-Kjerne v4.01 (Nor)</description>
 		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Tiki-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="tkjer401.dsk" size="409600" crc="9049393a" sha1="e79dbb6325e55a162184705d6f6536b76be483cf" offset="0"/>
@@ -897,21 +888,10 @@
 		</part>
 	</software>
 
-	<software name="tp310a">
-		<description>Turbo Pascal v3.10a</description>
-		<year>198?</year>
-		<publisher>&lt;unknown&gt;</publisher>
-		<part name="flop1" interface="floppy_5_25">
-			<dataarea name="flop" size="409600">
-				<rom name="tp310a.dsk" size="409600" crc="da023e3e" sha1="5f6c0acaaf821632be5aaf5e45f3395d86e3952e" offset="0"/>
-			</dataarea>
-		</part>
-	</software>
-
 	<software name="tpascal">
-		<description>Turbo Pascal</description>
+		<description>Turbo Pascal System v2.00A</description>
-		<year>198?</year>
+		<year>1984</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Borland</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="tpascal.dsk" size="409600" crc="3538995d" sha1="4a1357d3b778f34e343c33c274c0c6f587668f0f" offset="0"/>
@@ -919,10 +899,21 @@
 		</part>
 	</software>
 
+	<software name="tp310a" cloneof="tpascal">
+		<description>Turbo Pascal System v3.01A</description>
+		<year>1985</year>
+		<publisher>Borland</publisher>
+		<part name="flop1" interface="floppy_5_25">
+			<dataarea name="flop" size="409600">
+				<rom name="tp310a.dsk" size="409600" crc="da023e3e" sha1="5f6c0acaaf821632be5aaf5e45f3395d86e3952e" offset="0"/>
+			</dataarea>
+		</part>
+	</software>
+
 	<software name="trespill">
-		<description>Tre spill (og tre til) (Nor)</description>
+		<description>Tre-Spill II (Nor)</description>
-		<year>198?</year>
+		<year>1986</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Datalauget</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="409600">
 				<rom name="trespill.dsk" size="409600" crc="133ca04c" sha1="2d8c04f610cb28c971add339808e99435583b7c9" offset="0"/>
@@ -943,8 +934,8 @@
 
 	<software name="verdgeo">
 		<description>Verdensgeografi (Nor)</description>
-		<year>198?</year>
+		<year>1983</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>Tiki-Data</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="verdensgeografi.dsk" size="204800" crc="1f91b849" sha1="182e5d7df6239387be194dda49469280aab21655" offset="0"/>
@@ -953,7 +944,7 @@
 	</software>
 
 	<software name="wcsys">
-		<description>Winchester systemdiskett (Nor)</description>
+		<description>Tiki-100 System for Winchester Harddisk (Nor)</description>
 		<year>198?</year>
 		<publisher>&lt;unknown&gt;</publisher>
 		<part name="flop1" interface="floppy_5_25">
@@ -964,13 +955,14 @@
 	</software>
 
 	<software name="wordstar">
-		<description>WordStar</description>
+		<description>Wordstar v3.00 (Nor)</description>
-		<year>198?</year>
+		<year>1981</year>
-		<publisher>&lt;unknown&gt;</publisher>
+		<publisher>MicroPro</publisher>
 		<part name="flop1" interface="floppy_5_25">
 			<dataarea name="flop" size="204800">
 				<rom name="wordstar.dsk" size="204800" crc="e3ff829d" sha1="1f2a6bf08eb41819b9699950f26058a1d5ad6b3c" offset="0"/>
 			</dataarea>
 		</part>
 	</software>
+
 </softwarelist>

src/emu/machine/wd_fdc.c

@@ -1465,6 +1465,10 @@ void wd_fdc_t::live_run(attotime limit)
 			set_drq();
 
 			if(cur_live.bit_counter == 16*6) {
+				if(cur_live.crc) {
+					status |= S_CRC;
+				}
+
 				// Already synchronous
 				cur_live.state = IDLE;
 				return;

src/lib/formats/tiki100_dsk.c

@@ -30,68 +30,84 @@ const char *tiki100_format::extensions() const
 	return "dsk";
 }
 
-// Unverified gap sizes
-// double sided disks have t0s0,t0s1,t1s0,t1s1... format
 const tiki100_format::format tiki100_format::formats[] = {
+	// track description
+	// 20xff 6x00 fe 2x00 01 00 f7 11xff 6x00 fb 128xe5 f7
+	// 7xff 6x00 fe 2x00 0a 00 f7 11xff 6x00 fb 128xe5 f7
+	// 7xff 6x00 fe 2x00 06 00 f7 11xff 6x00 fb 128xe5 f7
+	// 7xff 6x00 fe 2x00 0f 00 f7 11xff 6x00 fb 128xe5 f7
+	// 7xff 6x00 fe 2x00 0b 00 f7 11xff 6x00 fb 128xe5 f7
+	// 7xff 6x00 fe 2x00 02 00 f7 11xff 6x00 fb 128xe5 f7
+	// 7xff 6x00 fe 2x00 10 00 f7 11xff 6x00 fb 128xe5 f7
+	// 7xff 6x00 fe 2x00 07 00 f7 11xff 6x00 fb 128xe5 f7
+	// 7xff 6x00 fe 2x00 03 00 f7 11xff 6x00 fb 128xe5 f7
+	// 7xff 6x00 fe 2x00 0c 00 f7 11xff 6x00 fb 128xe5 f7
+	// 7xff 6x00 fe 2x00 08 00 f7 11xff 6x00 fb 128xe5 f7
+	// 7xff 6x00 fe 2x00 11 00 f7 11xff 6x00 fb 128xe5 f7
+	// 7xff 6x00 fe 2x00 0d 00 f7 11xff 6x00 fb 128xe5 f7
+	// 7xff 6x00 fe 2x00 04 00 f7 11xff 6x00 fb 128xe5 f7
+	// 7xff 6x00 fe 2x00 12 00 f7 11xff 6x00 fb 128xe5 f7
+	// 7xff 6x00 fe 2x00 09 00 f7 11xff 6x00 fb 128xe5 f7
+	// 7xff 6x00 fe 2x00 05 00 f7 11xff 6x00 fb 128xe5 f7
+	// 7xff 6x00 fe 2x00 0e 00 f7 11xff 6x00 fb 128xe5 f7
+	// 89xff
 	{   //  90K 5 1/4 inch single density single sided
 		floppy_image::FF_525, floppy_image::SSSD, floppy_image::FM,
-		4000, 18, 40, 1, 128, {}, 1, {}, 16, 11, 8
+		4000, 18, 40, 1, 128, {}, -1, { 1,10,6,15,11,2,16,7,3,12,8,17,13,4,12,9,5,14 }, 20, 11, 7
 	},
+
+	// track description
+	// 20x4e 12x00 3xf5 fe 2x00 01 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 06 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 02 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 07 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 03 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 08 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 04 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 09 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 05 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 0a 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 275x4e
 	{   //  200K 5 1/4 inch double density single sided
 		floppy_image::FF_525, floppy_image::SSDD, floppy_image::MFM,
-		2000, 10, 40, 1, 512, {}, -1, { 1,6,2,7,3,8,4,9,5,10 }, 80, 22, 20
+		2000, 10, 40, 1, 512, {}, -1, { 1,6,2,7,3,8,4,9,5,10 }, 20, 22, 24
 	},
+
+	// track description
+	// 20x4e 12x00 3xf5 fe 2x00 01 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 06 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 02 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 07 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 03 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 08 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 04 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 09 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 05 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 0a 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 275x4e
 	{   //  400K 5 1/4 inch double density
 		floppy_image::FF_525, floppy_image::DSDD, floppy_image::MFM,
-		2000, 10, 40, 2, 512, {}, -1, { 1,6,2,7,3,8,4,9,5,10 }, 80, 22, 20
+		2000, 10, 40, 2, 512, {}, -1, { 1,6,2,7,3,8,4,9,5,10 }, 20, 22, 24
 	},
+
+	// track description
+	// 20x4e 12x00 3xf5 fe 2x00 01 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 06 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 02 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 07 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 03 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 08 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 04 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 09 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 05 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 24x4e 12x00 3xf5 fe 2x00 0a 02 f7 22x4e 12x00 3xf5 fb 512xe5 f7
+	// 275x4e
 	{   //  800K 5 1/4 inch quad density
 		floppy_image::FF_525, floppy_image::DSQD, floppy_image::MFM,
-		2000, 10, 80, 2, 512, {}, -1, { 1,6,2,7,3,8,4,9,5,10 }, 80, 22, 20
+		2000, 10, 80, 2, 512, {}, -1, { 1,6,2,7,3,8,4,9,5,10 }, 20, 22, 24
 	},
+
 	{}
 };
 
-floppy_image_format_t::desc_e* tiki100_format::get_desc_fm(const format &f, int &current_size, int &end_gap_index)
-{
-	static floppy_image_format_t::desc_e desc[23] = {
-		/* 00 */ { FM, 0xff, f.gap_1 },
-		/* 01 */ { SECTOR_LOOP_START, 0, f.sector_count-1 },
-		/* 02 */ {   FM, 0x00, 4 }, // NOTE here is the difference to wd177x_format
-		/* 03 */ {   CRC_CCITT_FM_START, 1 },
-		/* 04 */ {     RAW, 0xf57e, 1 },
-		/* 05 */ {     TRACK_ID_FM },
-		/* 06 */ {     HEAD_ID_FM },
-		/* 07 */ {     SECTOR_ID_FM },
-		/* 08 */ {     SIZE_ID_FM },
-		/* 09 */ {   CRC_END, 1 },
-		/* 10 */ {   CRC, 1 },
-		/* 11 */ {   FM, 0xff, f.gap_2 },
-		/* 12 */ {   FM, 0x00, 6 },
-		/* 13 */ {   CRC_CCITT_FM_START, 2 },
-		/* 14 */ {     RAW, 0xf56f, 1 },
-		/* 15 */ {     SECTOR_DATA_FM, -1 },
-		/* 16 */ {   CRC_END, 2 },
-		/* 17 */ {   CRC, 2 },
-		/* 18 */ {   FM, 0xff, f.gap_3 },
-		/* 19 */ { SECTOR_LOOP_END },
-		/* 20 */ { FM, 0xff, 0 },
-		/* 21 */ { RAWBITS, 0xffff, 0 },
-		/* 22 */ { END }
-	};
-
-	current_size = f.gap_1*16;
-	if(f.sector_base_size)
-		current_size += f.sector_base_size * f.sector_count * 16;
-	else {
-		for(int j=0; j != f.sector_count; j++)
-			current_size += f.per_sector_size[j] * 16;
-	}
-	current_size += (4+1+4+2+f.gap_2+6+1+2+f.gap_3) * f.sector_count * 16;
-
-	end_gap_index = 20;
-
-	return desc;
-}
-
 const floppy_format_type FLOPPY_TIKI100_FORMAT = &floppy_image_format_creator<tiki100_format>;

src/lib/formats/tiki100_dsk.h

@@ -21,8 +21,6 @@ public:
 	virtual const char *description() const;
 	virtual const char *extensions() const;
 
-	virtual floppy_image_format_t::desc_e* get_desc_fm(const format &f, int &current_size, int &end_gap_index);
-
 private:
 	static const format formats[];
 };

src/mess/drivers/tiki100.c

@@ -14,13 +14,13 @@
 
     TODO:
 
-    - floppy broken
     - palette RAM should be written during HBLANK
     - DART clocks
     - winchester hard disk
     - analog/digital I/O
     - light pen
     - 8088 CPU card
+    - 360KB floppy format
 
 */
 
@@ -224,7 +224,7 @@ static ADDRESS_MAP_START( tiki100_io, AS_IO, 8, tiki100_state )
 	AM_RANGE(0x17, 0x17) AM_DEVREADWRITE(AY8912_TAG, ay8910_device, data_r, data_w)
 	AM_RANGE(0x18, 0x1b) AM_DEVREADWRITE(Z80CTC_TAG, z80ctc_device, read, write)
 	AM_RANGE(0x1c, 0x1c) AM_MIRROR(0x03) AM_WRITE(system_w)
-	AM_RANGE(0x20, 0x27) AM_NOP // winchester controller
+//	AM_RANGE(0x20, 0x27) AM_NOP // winchester controller
 //  AM_RANGE(0x60, 0x6f) analog I/O (SINTEF)
 //  AM_RANGE(0x60, 0x67) digital I/O (RVO)
 //  AM_RANGE(0x70, 0x77) analog/digital I/O
@@ -592,7 +592,7 @@ void tiki100_state::machine_start()
 
 static MACHINE_CONFIG_START( tiki100, tiki100_state )
 	/* basic machine hardware */
-	MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/4)
+	MCFG_CPU_ADD(Z80_TAG, Z80, XTAL_8MHz/2)
 	MCFG_CPU_PROGRAM_MAP(tiki100_mem)
 	MCFG_CPU_IO_MAP(tiki100_io)
 	MCFG_CPU_CONFIG(tiki100_daisy_chain)
@@ -614,8 +614,8 @@ static MACHINE_CONFIG_START( tiki100, tiki100_state )
 	MCFG_Z80CTC_ADD(Z80CTC_TAG, XTAL_8MHz/4, ctc_intf)
 	MCFG_TIMER_DRIVER_ADD_PERIODIC("ctc", tiki100_state, ctc_tick, attotime::from_hz(XTAL_8MHz/4))
 	MCFG_FD1797x_ADD(FD1797_TAG, XTAL_8MHz/8) // FD1767PL-02 or FD1797-PL
-	MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":0", tiki100_floppies, "525ssdd", tiki100_state::floppy_formats)
+	MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":0", tiki100_floppies, "525qd", tiki100_state::floppy_formats)
-	MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":1", tiki100_floppies, "525ssdd", tiki100_state::floppy_formats)
+	MCFG_FLOPPY_DRIVE_ADD(FD1797_TAG":1", tiki100_floppies, "525qd", tiki100_state::floppy_formats)
 
 	/* sound hardware */
 	MCFG_SPEAKER_STANDARD_MONO("mono")
@@ -657,5 +657,5 @@ ROM_END
 /* System Drivers */
 
 /*    YEAR  NAME        PARENT      COMPAT  MACHINE     INPUT       INIT    COMPANY             FULLNAME        FLAGS */
-COMP( 1984, kontiki,    0,          0,      tiki100,    tiki100, driver_device, 0,      "Kontiki Data A/S", "KONTIKI 100",  GAME_NOT_WORKING | GAME_SUPPORTS_SAVE )
+COMP( 1984, kontiki,    0,          0,      tiki100,    tiki100, driver_device, 0,      "Kontiki Data A/S", "KONTIKI 100",  GAME_SUPPORTS_SAVE )
-COMP( 1984, tiki100,    kontiki,    0,      tiki100,    tiki100, driver_device, 0,      "Tiki Data A/S",    "TIKI 100",     GAME_NOT_WORKING | GAME_SUPPORTS_SAVE )
+COMP( 1984, tiki100,    kontiki,    0,      tiki100,    tiki100, driver_device, 0,      "Tiki Data A/S",    "TIKI 100",     GAME_SUPPORTS_SAVE )