Merge branch 'master' into master

diff --cc asminc/telestrat.inc
index 9d79499203909653a2acef7e118664d6f35af0af,df607e375002bfef9f5ec9ed641c2bdf8dd13450..c4dc509a31f50ab1b017076c80220798d9b055e6
--- 1/asminc/telestrat.inc
--- 2/asminc/telestrat.inc
+++ b/asminc/telestrat.inc
@@@ -73,7 -64,6 +73,9 @@@ XLPRBI          := $48           ; Prin
  
  HRSX40          := $49
  HRSX6           := $4A
++
 +ADHRS           := $4B           ; hires screen address (word)
++
  HRS1            := $4D
  HRS2            := $4F
  HRS3            := $51
@@@ -229,8 -203,6 +231,10 @@@ XFREAD           = $27          ; Only 
  XBINDX           = $28          ; Convert a number into hex and displays on channel 0
  XDECIM           = $29
  XHEXA            = $2A          ; Convert a number into hex
++
 +XEDT             = $2D          ; Launch editor
 +XINSER           = $2E
++
  XSCELG           = $2F          ; Search a line in editor mode
  XOPEN            = $30          ; Only in TELEMON 3.x (bank 7 of Orix)
  XECRPR           = $33          ; Displays prompt
@@@ -299,7 -256,6 +303,8 @@@ BUFTRV          := $10
  ; Page $200
  BNKST            := $200        ; Used to store signature of 8 bank (length : 8 bytes)
  TABDRV           := $208
++
 +DRVDEF           := $20C
  FLGTEL           := $20D
  KOROM            := $20E        ; Used to compute the size of all rom bank. The result is store here. The value is in KB
  KORAM            := $20F        ; Used to compute the size of all ram bank. The result is store here. The value is in KB
@@@ -307,70 -262,22 +312,74 @@@
  TIMED            := $210
  TIMES            := $211
  TIMEM            := $212
 +TIMEH            := $213
 +FLGCLK           := $214
 +FLGCLK_FLAG      := $215 
 +FLGCUR           := $216        ; cursor management flag
 +; screens position managements
 +
 +FLGCUR_STATE     := $217        ; cursor state flag
++
  ADSCRL           := $218
  ADSCRH           := $21C
  SCRX             := $220
  SCRY             := $224
- 
++
 +SCRDX            := $228
 +SCRFX            := $22C
 +SCRDY            := $230
 +SCRFY            := $234
 +SCRBAL           := $238
 +SCRBAH           := $23C
 +SCRCT            := $240
 +SCRCF            := $244
 +FLGSCR           := $248
 +CURSCR           := $24C
 +
 +HARD_COPY_HIRES  := $250        ; Hard copy vector
 +
 +SCRTXT           := $256
 +SCRHIR           := $25C
 +SCRTRA           := $262        ; 6 bytes lenfth
 +
 +; Keyboard management
 +KBDCOL           := $268        ; 8 bytes length
 +KBDFLG_KEY       := $270        ; 0 if no key pressed
 +KBDVRR           := $272
++
  KBDVRL           := $273
  FLGKBD           := $275
  KBDFCT           := $276
  KBDSHT           := $278
++
 +KBDKEY           := $279
  KBDCTC           := $27E
 +LPRX             := $286
 +LPRY             := $287
  LPRFX            := $288
  LPRFY            := $289
 +FLGLPR           := $28A
 +
 +; Joysticks management
 +FLGJCK           := $28C
 +JCGVAL           := $28D
 +JCDVAL           := $28E
 +JCKTAB           := $29D
 +
 +
  HRSPAT           := $2AA        ; Hires pattern : it's used to draw pattern for a line or a circle
 -ADIOB            := $2BE
 +HRSERR           := $2AB
 +
 +IOTAB0           := $2AE
 +IOTAB1           := $2B2
 +IOTAB2           := $2B6
 +IOTAB3           := $2BA
 +ADIOB            := $2BE        ; 48 bytes length
  FLGRST           := $2EE
  CSRND            := $2EF
  VNMI             := $2F4
 +ADIODB_VECTOR    := $2f7        ; 3 bytes length
++
  IRQVECTOR        := $2FA
  VAPLIC           := $2FD
  
@@@ -403,28 -310,25 +412,81 @@@ MAX_BUFEDT_LENGTH=11
  CH376_DATA       := $340
  CH376_COMMAND    := $341
  
 +; RAM overlays buffer
 +BUFBUF           := $c080
 +
 +; ---------------------------------------------------------------------------
 +; Stratsed vectors
 +; Stratsed is the main OS for Telestrat 
 +XMERGE           := $FF0E
 +XFST             := $FF11
 +XSPUT            := $FF14
 +XSTAKE           := $FF17
 +XTAKE            := $FF20
 +XOPENS           := $FF1A       ; XOPEN from Stratsed
 +XCLOSES          := $FF1D       ; XCLOSE from Stratsed
 +XPUT             := $FF23
 +XREWIN           := $FF29
 +XJUMP            := $FF2C
 +XLGBUF           := $FF2F
 +XERVEC           := $FF32
 +XESAVE           := $FF35
 +XCOPY            := $FF38
 +XDNAME           := $FF3B
 +XSTATU           := $FF3E
++XUPDAT           := $FF41
++XFORMA           := $FF44
++XDELBK           := $FF4A
++XDELN            := $FF4D
++XPROT            := $FF50
++XUNPRO           := $FF53
++XDIRN            := $FF56
++XBKP             := $FF59
++XINITI           := $FF5C
++XERREU           := $FF5F
++XLOAD            := $FF62
++XDEFSA           := $FF65
++XDEFLO           := $FF68
++XSAVE            := $FF6B
++XNOMDE           := $FF6E
++XCREAY           := $FF71
++XDETSE           := $FF74
++XLIBSE           := $FF77
++XTRVCA           := $FF7A
++XTRVNM           := $FF7D
++XTRVNX           := $FF80
++XBUCA            := $FF86
++XVBUF1           := $FF89
++XSVSEC           := $FF8C
++XSAY             := $FF8F
++XSBUF1           := $FF92
++XSBUF2           := $FF95
++XSBUF3           := $FF98
++XSCAT            := $FF9B
++XPRSEC           := $FFA1
++XPBUF1           := $FFA4
++XPMAP            := $FFA7
++XRWTS            := $FFAA
++
+ ; ---------------------------------------------------------------------------
+ ; Stratsed vectors
+ ; Stratsed is the main OS for Telestrat 
+ XMERGE           := $FF0E
+ XFST             := $FF11
+ XSPUT            := $FF14
+ XSTAKE           := $FF17
+ XTAKE            := $FF20
+ XOPENS           := $FF1A       ; XOPEN from Stratsed
+ XCLOSES          := $FF1D       ; XCLOSE from Stratsed
+ XPUT             := $FF23
+ XREWIN           := $FF29
+ XJUMP            := $FF2C
+ XLGBUF           := $FF2F
+ XERVEC           := $FF32
+ XESAVE           := $FF35
+ XCOPY            := $FF38
+ XDNAME           := $FF3B
+ XSTATU           := $FF3E
  XUPDAT           := $FF41
  XFORMA           := $FF44
  XDELBK           := $FF4A

diff --cc doc/telestrat.sgml
index 97229db00beb94b24114175505936e978424bcb3,8d8aa23d26669335a09c47d339c88d9c3ccc0853..1c0b3d9549c5d7ca1be310fe146cb1d497ea36a8
--- 1/doc/telestrat.sgml
--- 2/doc/telestrat.sgml
+++ b/doc/telestrat.sgml
@@@ -192,34 -133,15 +192,33 @@@ port cardridge
  
  <sect1>Joystick drivers<p>
  
 -telemon 2.4 & 3.0 manages joysticks but it had been handled yet.
++
 +<descrip>
 +
 +Telemon 2.4 & 3.0 manages joysticks but it had been handled yet. This means that 
 +joysticks driver could be written easily.
 +
 +Telemon 2.4 returns in keyboard buffer the direction of the joysticks. This means that
 +if you get input from keyboard by conio cgetc function, you will get direction from joysticks.
 +
- </descrip>
- 
  
  <sect1>Mouse drivers<p>
  
 -Telestrat manages also mouse, but it had been no handled yet in this version.
++
 +<descrip>
 +
 +Telestrat manages also mouse, but it had been no handled yet in this version. 
 +Telestrat mouse is really difficult to find.
 +
- </descrip>
  
  <sect1>RS232 device drivers<p>
  
 -Telestrat has a RS232 port, but it's not usable in cc65.
++
 +<descrip>
 +
 +Telestrat has a RS232 port, but it's not usable in cc65. It is possible to use 
 +RS232 port with Telemon calls (see XSOUT primitive for example)
 +
- </descrip>
  
  <sect>Limitations<label id="limitations"><p>