diff --git a/hash/psion.xml b/hash/psion.xml
deleted file mode 100644
index 2a0167ce83c..00000000000
--- a/hash/psion.xml
+++ /dev/null
@@ -1,364 +0,0 @@
-
-
-
-
-
-
-
-
- Anteta Barcode Reader
- 198?
- Anteta
-
-
-
-
-
-
-
-
-
- Airnav Professional 2c
- 198?
- <unknown>
-
-
-
-
-
-
-
-
-
- AutoScribe Plus
- 1989
- Widget Software
-
-
-
-
-
-
-
-
-
- Assembler Pack 1.0
- 1989
- AR Software
-
-
-
-
-
-
-
-
-
-
- Comms Link
- 1987
- Psion Ltd
-
-
-
-
-
-
-
-
-
- Clipboard Inspection System
- 1991
- Rafiq Mahmood
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Coastal v4.2a
- 198?
- Maritek Ltd
-
-
-
-
-
-
-
-
-
- Finance
- 198?
- Aware
-
-
-
-
-
-
-
-
-
- Finance II
- 198?
- Aware
-
-
-
-
-
-
-
-
-
- Finger Organiser
- 1988
- Harvester Information Systems
-
-
-
-
-
-
-
-
-
- Fish
- 198?
- <unknown>
-
-
-
-
-
-
-
-
-
- FileMaster v3.76
- 1988
- Widget Software
-
-
-
-
-
-
-
-
-
- FNkey v3.1
- 1989
- Cubsoft
-
-
-
-
-
-
-
-
-
- Game Pack
- 198?
- <unknown>
-
-
-
-
-
-
-
-
-
- Inkasencki v6.1
- 199?
- <unknown>
-
-
-
-
-
-
-
-
-
- Maths
- 198?
- Psion
-
-
-
-
-
-
-
-
-
- ParaLink v2.0
- 198?
- Silvertree
-
-
-
-
-
-
-
-
-
- Personal Finance
- 1987
- Willow Enterprises Limited
-
-
-
-
-
-
-
-
-
- Result Vers 4L
- 1989
- Terrace Software
-
-
-
-
-
-
-
-
-
- Spreadsheet
- 1987
- Psion Ltd
-
-
-
-
-
-
-
-
-
- Top Finance v2.1f
- 1988
- Aware
-
-
-
-
-
-
-
-
-
- Travel Pack 1.5
- 1988
- Organized Solutions Ltd
-
-
-
-
-
-
-
-
-
- Formulator
- 198?
- Psion Ltd
-
-
-
-
-
-
-
-
-
- Formulator (Alt)
- 198?
- Psion Ltd
-
-
-
-
-
-
-
-
-
- Formulator Top
- 198?
- Psion Ltd
-
-
-
-
-
-
-
diff --git a/hash/psion1.xml b/hash/psion1.xml
new file mode 100644
index 00000000000..f0e6bfd1dab
--- /dev/null
+++ b/hash/psion1.xml
@@ -0,0 +1,101 @@
+
+
+
+
+ Finance Pack
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+ Link Up Pack
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+ Maths Pack
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+ Science Pack
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Software Pack
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+ Utility Pack
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Construction Pack
+ 198?
+ Wessex
+
+
+
+
+
+
+
+
+ Restaurant Guide
+ 198?
+ Psion
+
+
+
+
+
+
+
diff --git a/hash/psion2.xml b/hash/psion2.xml
new file mode 100644
index 00000000000..894caa4907a
--- /dev/null
+++ b/hash/psion2.xml
@@ -0,0 +1,1014 @@
+
+
+
+
+
+
+
+ Anteta Barcode Reader
+ 198?
+ Anteta
+
+
+
+
+
+
+
+
+
+ Airnav Professional 2c
+ 198?
+ <unknown>
+
+
+
+
+
+
+
+
+
+ Angler Pack
+ 198?
+ Skyfact Software
+
+
+
+
+
+
+
+
+
+ AutoScribe Plus v4.11
+ 1989
+ Widget Software
+
+
+
+
+
+
+
+
+
+ AutoScribe Plus v5.11
+ 198?
+ Widget Software
+
+
+
+
+
+
+
+
+
+ Assembler Pack v1.0
+ 1989
+ A.R. Software
+
+
+
+
+
+
+
+
+
+ Barcode Printer I v1.42
+ 198?
+ Gaascom Ltd.
+
+
+
+
+
+
+
+
+
+ Clipboard Inspection System
+ 1991
+ Rafiq Mahmood
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Coastal v4.2a
+ 198?
+ Maritek Ltd
+
+
+
+
+
+
+
+
+
+ The Data Organiser v2.4
+ 198?
+ Harvester Information Systems
+
+
+
+
+
+
+
+
+
+ Ferret Helper v5.1N
+ 198?
+ Ferret Information Systems
+
+
+
+
+
+
+
+
+
+ FileMaster v3.75
+ 1988
+ Widget Software
+
+
+
+
+
+
+
+
+
+ FileMaster v3.76
+ 1988
+ Widget Software
+
+
+
+
+
+
+
+
+
+ FileMaster v3.762
+ 1988
+ Widget Software
+
+
+
+
+
+
+
+
+
+ Finance Pack
+ 198?
+ Aware
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Finance Pack II
+ 198?
+ Aware
+
+
+
+
+
+
+
+
+
+ Finger Organiser v1.3
+ 198?
+ Harvester Information Systems
+
+
+
+
+
+
+
+
+
+ Finger Organiser v1.4
+ 198?
+ Harvester Information Systems
+
+
+
+
+
+
+
+
+
+ Flightmaster v2.19
+ 1993
+ Software 2000, Inc.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ FnKey v3.1
+ 1989
+ Cubsoft
+
+
+
+
+
+
+
+
+
+ FnKey v4.0
+ 1989
+ Cubsoft
+
+
+
+
+
+
+
+
+
+ Form Master
+ 198?
+ Cascade Systems Ltd.
+
+
+
+
+
+
+
+
+
+ Formulator v1.1
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+
+ Formulator v2.1
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+
+ Games Organiser v0.2
+ 198?
+ Harvester Information Systems
+
+
+
+
+
+
+
+
+
+ Games Pack
+ 198?
+ S.I.S. Ltd, Psion
+
+
+
+
+
+
+
+
+
+ Games Pack (Mick Andon)
+ 198?
+ Mick Andon
+
+
+
+
+
+
+
+
+
+ Harvester Superchip v1.2
+ 198?
+ Harvester Information Systems
+
+
+
+
+
+
+
+
+
+ Inkasencki v6.1
+ 199?
+ <unknown>
+
+
+
+
+
+
+
+
+
+ Jotter v2.5
+ 198?
+ Camel Systems Ltd
+
+
+
+
+
+
+
+
+
+ Maths Pack
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+
+ Personal Finance
+ 1987
+ Willow Enterprises Ltd
+
+
+
+
+
+
+
+
+
+ Portfolio Pack
+ 198?
+ DIP, Psion
+
+
+
+
+
+
+
+
+
+ Result Vers 4L
+ 1989
+ Terrace Software
+
+
+
+
+
+
+
+
+
+ SDRP 01.05
+ 198?
+ Datacom Group Ltd.
+
+
+
+
+
+
+
+
+
+ Concise Oxford Spelling Checker
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+
+ Spreadsheet v1.2
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+
+ Spreadsheet v1.3
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+
+ Spreadsheet v3.4
+ 1987
+ Psion
+
+
+
+
+
+
+
+
+
+ Thesaurus and Spelling Checker
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+
+ Top Finance 2.1f
+ 1988
+ Aware
+
+
+
+
+
+
+
+
+
+ Travel Pack v1.2
+ 1988
+ Organised Solutions Ltd, Psion
+
+
+
+
+
+
+
+
+
+ Travel Pack v1.5
+ 1988
+ Organised Solutions Ltd, Psion
+
+
+
+
+
+
+
+
+
+ Travel Pack v2.0
+ 198?
+ Organised Solutions Ltd, Psion
+
+
+
+
+
+
+
+
+
+ XBase v2.0
+ 198?
+ Cubsoft
+
+
+
+
+
+
+
+
+
+ XBase v3.0
+ 198?
+ Cubsoft
+
+
+
+
+
+
+
+
+
+ Formulator (Alt)
+ 198?
+ Psion Ltd
+
+
+
+
+
+
+
+
+
+ Formulator Top
+ 198?
+ Psion Ltd
+
+
+
+
+
+
+
+
+
+
+ Dial-Link
+ 198?
+ Widget Software
+
+
+
+
+
+
+
+
+
+
+ Digitron SF10 v1.10
+ 198?
+ Silvertree Eng., Digitron Inst.
+
+
+
+
+
+
+
+
+
+
+ Digitron SF10 v1.14
+ 198?
+ Silvertree Eng., Digitron Inst.
+
+
+
+
+
+
+
+
+
+
+ FlashPak Driver v1.9
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+
+
+ KDG Mobrey MSP100 v1.0
+ 198?
+ KDG Mobrey
+
+
+
+
+
+
+
+
+
+
+
+ One-Way Interface
+ 198?
+ On-Line Design Inc
+
+
+
+
+
+
+
+
+
+
+
+ PsiTex v2.000
+ 198?
+ Microtima
+
+
+
+
+
+
+
+
+
+
+
+ SigSet v2.01
+ 198?
+ Microtima
+
+
+
+
+
+
+
+
+
+
+
+ Sony Lisa-1 v3.0
+ 198?
+ Sony
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ RS232 Link 1.1
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+ RS232 Link 1.5
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+ Comms Link 2.4
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+ Comms Link 2.5
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+ Comms Link 3.0
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+ Comms Link 4.0
+ 1987
+ Psion
+
+
+
+
+
+
+
+
+ Comms Link 4.1
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+ Comms Link 4.2
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+
+ Extech Comms Printer II 4.3
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+
+ Dynapen 4.4
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+ Psion Printer 1.6
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+ Psion Printer 2.1
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+ Psion Printer 2.2
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+ Magnetic Card Reader 2.0
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+ Bad Code Reader 3.1
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+ Bad Code Reader 3.2
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+ Pager 1.3
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+ Paralink 2.0
+ 198?
+ Silvertree Engineering Ltd.
+
+
+
+
+
+
+
+
+ Paralink 3.3
+ 198?
+ Silvertree Engineering Ltd.
+
+
+
+
+
+
+
+
+ Paralink 3.4
+ 198?
+ Silvertree Engineering Ltd.
+
+
+
+
+
+
+
+
+ Andover Controls Hand-Held Operator's Terminal
+ 198?
+ Psion
+
+
+
+
+
+
+
+
+ CNF41 HART interface 1.0
+ 198?
+ Psion
+
+
+
+
+
+
+
+
diff --git a/src/mess/drivers/psion.c b/src/mess/drivers/psion.c
index 9bc5bac3ee9..effe246f0f2 100644
--- a/src/mess/drivers/psion.c
+++ b/src/mess/drivers/psion.c
@@ -595,7 +595,7 @@ static MACHINE_CONFIG_START( psion_2lines, psion_state )
MCFG_PSION_DATAPACK_ADD("pack2")
/* Software lists */
- MCFG_SOFTWARE_LIST_ADD("pack_list", "psion")
+ MCFG_SOFTWARE_LIST_ADD("pack_list", "psion2")
MACHINE_CONFIG_END
/* basic configuration for 4 lines display */
@@ -624,6 +624,10 @@ static MACHINE_CONFIG_DERIVED_CLASS( psion1, psion_2lines, psion1_state )
MCFG_DEVICE_MODIFY("hd44780")
MCFG_HD44780_LCD_SIZE(1, 16)
MCFG_HD44780_PIXEL_UPDATE_CB(psion1_state::psion1_pixel_update)
+
+ /* Software lists */
+ MCFG_SOFTWARE_LIST_REMOVE("pack_list")
+ MCFG_SOFTWARE_LIST_ADD("pack_list", "psion1")
MACHINE_CONFIG_END
static MACHINE_CONFIG_DERIVED( psioncm, psion_2lines )
@@ -696,6 +700,8 @@ ROM_START( psionla )
ROMX_LOAD( "34-lag.rom", 0x8000, 0x8000, CRC(13a92c4b) SHA1(dab8bd6a41a5fd509c5ad4b0b0ab80d14f2c421a), ROM_BIOS(2))
ROM_SYSTEM_BIOS(2, "v36", "LA v3.6")
ROMX_LOAD( "36-la.rom", 0x8000, 0x8000, CRC(7442c7f6) SHA1(94f15bd06bd750be70fa4a4ab588237c5a703f65), ROM_BIOS(3))
+ ROM_SYSTEM_BIOS(3, "v30", "LA v3.0")
+ ROMX_LOAD( "30-lahp.rom", 0x8000, 0x8000, CRC(50192528) SHA1(c556d53f70bf5ecae756b2ebfc6d954912316bbe), ROM_BIOS(4))
ROM_END
ROM_START( psionp200 )