Commit e265f0ca authored by Simon Middleton's avatar Simon Middleton
Browse files

Merged in the new Windows keys definitions that have been added to the Trunk...

Merged in the new Windows keys definitions that have been added to the Trunk version of this module. This results in a clash as the righ Windows key has a proper definition but the Funai NC build expects it to generate the same code as the handset POWER key. At some point the module that relies on this code (presumably Standby) should be changed to pick up the correct code. In the mean time there is a variable to control which mapping is used and it set to use the correct mapping. Beware - if this module is used in a Funai build it will need changing back.

Also converted the module to use srccommit (of course).

Version 0.25, 1.1.2.2. Tagged as 'PS2Driver-0_25-1_1_2_2'
parent c64d8585
......@@ -38,13 +38,9 @@
; 03-Jun-97 0.22 SMC Added support for POWER button on RCA keyboard.
; 03-Jun-97 0.23 SMC Fixed support for POWER button on RCA keyboard.
; 27-Mar-98 0.24 SMC Added support for POWER key on Funai keyboard.
; 05-Jun-98 0.25 SJM Merged in Windows keys from trunk. Made the Funai WinR to POWER
; mapping conditional as the definitions clash.
GBLA Version
GBLS VString
GBLS Date
Version SETA 024
VString SETS "0.24"
Date SETS "27 Mar 1998"
; SJM: note all version definitions come from VersionNum since 0.25
END
......@@ -5,8 +5,8 @@
GBLA Module_Version
GBLS Module_MinorVersion
GBLS Module_Date
Module_MajorVersion SETS "0.24"
Module_Version SETA 24
Module_MinorVersion SETS "$Revision$"
Module_MajorVersion SETS "0.25"
Module_Version SETA 25
Module_MinorVersion SETS "1.1.2.2"
Module_Date SETS "05 Jun 1998"
END
/* (0.24)
/* (0.25)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 0.24
#define Module_MinorVersion_CMHG $Revision$
#define Module_MajorVersion_CMHG 0.25
#define Module_MinorVersion_CMHG 1.1.2.2
#define Module_Date_CMHG 05 Jun 1998
#define Module_MajorVersion "0.24"
#define Module_Version 24
#define Module_MinorVersion "$Revision$"
#define Module_MajorVersion "0.25"
#define Module_Version 25
#define Module_MinorVersion "1.1.2.2"
#define Module_Date "05 Jun 1998"
......@@ -47,6 +47,7 @@ Module_BaseAddr
GET Hdr:Standby
GET Version
GET VersionASM
;---------------------------------------------------------------------------
; Define global variables.
......@@ -103,6 +104,9 @@ CaptureInput SETL false
GBLL IDEASupport ; support extra keys on IDEA keyboard
IDEASupport SETL true
GBLL MapWinRToPower ; this should be true for Funai build. Off for everyone else
MapWinRToPower SETL false
;---------------------------------------------------------------------------
; Get the sources.
;
......
......@@ -33,7 +33,7 @@
;---------------------------------------------------------------------------
Title DCB "PS2Driver",0
Helpstr DCB "PS2Driver",9,"$VString ($Date)",0
Helpstr DCB "PS2Driver",9,Module_MajorVersion," (",Module_Date,") ",Module_MinorVersion,0
ALIGN
;---------------------------------------------------------------------------
......
......@@ -1388,7 +1388,7 @@ StandbyCallback
KeyTable
DCB &FF, &09, &FF, &05, &03, &01, &02, &0C ; 00-07
DCB &99, &0A, &08, &06, &04, &26, &10, &FF ; 08-0F
DCB &9A, &5E, &4C, &FF, &3B, &27, &11, &A1 ; 10-17
DCB &9A, &5E, &4C, &6D, &3B, &27, &11, &A1 ; 10-17
DCB &9B, &A2, &4E, &3D, &3C, &28, &12, &95 ; 18-1F
DCB &9C, &50, &4F, &3E, &29, &14, &13, &96 ; 20-27
DCB &9D, &5F, &51, &3F, &2B, &2A, &15, &97 ; 28-2F
......@@ -1396,10 +1396,10 @@ KeyTable
DCB &9F, &A4, &54, &42, &2D, &17, &18, &FF ; 38-3F
DCB &A0, &55, &43, &2E, &2F, &1A, &19, &FF ; 40-47
DCB &A9, &56, &57, &44, &45, &30, &1B, &FF ; 48-4F
DCB &A6, &FF, &46, &A5, &31, &1C, &FF, &FF ; 50-57
DCB &A6, &6E, &46, &A5, &31, &1C, &FF, &FF ; 50-57
DCB &5D, &58, &47, &32, &A8, &33, &98, &A3 ; 58-5F
DCB &FF, &4D, &FF, &FF, &FF, &FF, &1E, &FF ; 60-67
DCB &FF, &5A, &FF, &48, &37, &FF, &FF, &A7 ; 68-6F
DCB &FF, &4D, &FF, &FF, &6C, &FF, &1E, &6B ; 60-67
DCB &FF, &5A, &1D, &48, &37, &FF, &FF, &A7 ; 68-6F
DCB &65, &66, &5B, &49, &4A, &38, &00, &22 ; 70-77
DCB &0B, &4B, &5C, &3A, &24, &39, &0E, &FF ; 78-7F
DCB &FF, &FF, &FF, &07, &0D, &FF, &FF, &FF ; 80-87
......@@ -1412,7 +1412,7 @@ KeyTable
KeyTable
DCB &FF, &09, &FF, &05, &03, &01, &02, &0C ; 00-07
DCB &FF, &0A, &08, &06, &04, &26, &10, &FF ; 08-0F
DCB &FF, &5E, &4C, &FF, &3B, &27, &11, &FF ; 10-17
DCB &FF, &5E, &4C, &6D, &3B, &27, &11, &FF ; 10-17
DCB &FF, &FF, &4E, &3D, &3C, &28, &12, &FF ; 18-1F
DCB &FF, &50, &4F, &3E, &29, &14, &13, &FF ; 20-27
DCB &FF, &5F, &51, &3F, &2B, &2A, &15, &FF ; 28-2F
......@@ -1420,10 +1420,10 @@ KeyTable
DCB &FF, &FF, &54, &42, &2D, &17, &18, &FF ; 38-3F
DCB &FF, &55, &43, &2E, &2F, &1A, &19, &FF ; 40-47
DCB &FF, &56, &57, &44, &45, &30, &1B, &FF ; 48-4F
DCB &FF, &FF, &46, &FF, &31, &1C, &FF, &FF ; 50-57
DCB &FF, &6E, &46, &FF, &31, &1C, &FF, &FF ; 50-57
DCB &5D, &58, &47, &32, &FF, &33, &FF, &FF ; 58-5F
DCB &FF, &4D, &FF, &FF, &FF, &FF, &1E, &FF ; 60-67
DCB &FF, &5A, &FF, &48, &37, &FF, &FF, &FF ; 68-6F
DCB &FF, &4D, &FF, &FF, &6C, &FF, &1E, &6B ; 60-67
DCB &FF, &5A, &1D, &48, &37, &FF, &FF, &FF ; 68-6F
DCB &65, &66, &5B, &49, &4A, &38, &00, &22 ; 70-77
DCB &0B, &4B, &5C, &3A, &24, &39, &0E, &FF ; 78-7F
DCB &FF, &FF, &FF, &07, &0D, &FF, &FF, &FF ; 80-87
......@@ -1438,9 +1438,13 @@ SpecialTable
DCB &FF, &FF, &FF, &FF, &FF, &FF, &FF, &FF ; 00-07
DCB &FF, &FF, &FF, &FF, &FF, &FF, &FF, &FF ; 08-0F
DCB &FF, &60, &FF, &FF, &61, &FF, &FF, &FF ; 10-17
DCB &FF, &FF, &FF, &FF, &FF, &FF, &FF, &FF ; 18-1F
DCB &FF, &FF, &FF, &FF, &FF, &FF, &FF, &68 ; 18-1F
[ MapWinRToPower
DCB &FF, &FF, &FF, &FF, &FF, &FF, &FF, &80 ; 20-27
DCB &FF, &FF, &FF, &FF, &FF, &FF, &FF, &FF ; 28-2F
|
DCB &FF, &FF, &FF, &FF, &FF, &FF, &FF, &69 ; 20-27
]
DCB &FF, &FF, &FF, &FF, &FF, &FF, &FF, &6A ; 28-2F
DCB &FF, &FF, &FF, &FF, &FF, &FF, &FF, &FF ; 30-37
DCB &FF, &FF, &FF, &FF, &FF, &FF, &FF, &FF ; 38-3F
DCB &FF, &FF, &FF, &FF, &FF, &FF, &FF, &FF ; 40-47
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment