Minor update by Oliver Schmidt

git-svn-id: svn://svn.cc65.org/cc65/trunk@3746 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/doc/cc65.sgml b/doc/cc65.sgml
index 6927ffc5c81f11d1b511252e4e6f6bca2638f336..dd2b10b33d62be5df0ddf96c3aa372a518bcc355 100644 (file)
--- a/doc/cc65.sgml
+++ b/doc/cc65.sgml
@@ -599,7 +599,7 @@ The compiler defines several macros at startup:
 
   <tag><tt>__APPLE2ENH__</tt></tag>
 
 
   <tag><tt>__APPLE2ENH__</tt></tag>
 

-  This macro is defined if the target is the enhanced Apple // (-t apple2enh).
+  This macro is defined if the target is the enhanced Apple //e (-t apple2enh).

 
   <tag><tt>__ATARI__</tt></tag>
 
 
   <tag><tt>__ATARI__</tt></tag>
 

diff --git a/doc/intro.sgml b/doc/intro.sgml
index 90905af0a6b4893ae900c4781db1c8c91f2f7182..c2266696b5fad36fc17caeb395d7ac0a12d731db 100644 (file)
--- a/doc/intro.sgml
+++ b/doc/intro.sgml
@@ -249,14 +249,14 @@ as each target varies in it's start and exit conditions.
 
 <sect1>Apple
 
 
 <sect1>Apple
 

-<sect2>AppleWin 1.10.4<p>
-Available at <url url="http://www.jantzer-schmidt.de/applewin/">:
+<sect2>AppleWin 1.x<p>
+Available at <url url="http://applewin.berlios.de/">:

 
 

-Emulates Apple II+/IIe computers, with sound, video, joysticks, serial port,
+Emulates Apple II/IIe computers, with sound, video, joysticks, serial port,

 and disk images. Includes monitor. Only for Windows. The package comes with
 and disk images. Includes monitor. Only for Windows. The package comes with

-ROM and DOS 3.3 disk (called "master.dsk") images; however, you will need
-<bf/a2tools/ (available at <url
-url="http://hotel04.ausys.se/pausch/apple2/#a2tools">).
+DOS 3.3 disk (called "master.dsk") images; however, you will need <bf/a2tools/
+(available at <url
+url="ftp://ftp.apple.asimov.net/pub/apple_II/unsorted/a2tools.zip">).

 
 Compile the tutorial with
 
 
 Compile the tutorial with
 


@@ -292,8 +292,8 @@ BRUN TEST
 </verb></tscreen>
 
 You will see the "Hello, World!" appear on the same line.  Thanks to Oliver
 </verb></tscreen>
 
 You will see the "Hello, World!" appear on the same line.  Thanks to Oliver

-Schmidt, <htmlurl url="mailto:oliver@jantzer-schmidt.de"
-name="oliver@jantzer-schmidt.de"> for his help in completing this section.
+Schmidt, <htmlurl url="mailto:ol.sc@web.de" name="ol.sc@web.de"> for his help
+in completing this section.

 
 
 <sect1>Atari
 
 
 <sect1>Atari

diff --git a/doc/ld65.sgml b/doc/ld65.sgml
index a3b5952706c2ab0dba09f3fce0445dd686995e02..b001faaf12a2a7ecb7fc651a3a9be8eefa45e558 100644 (file)
--- a/doc/ld65.sgml
+++ b/doc/ld65.sgml
@@ -153,6 +153,7 @@ Here is a description of all the command line options:
   <itemize>
   <item>none
   <item>apple2
   <itemize>
   <item>none
   <item>apple2

+  <item>apple2enh

   <item>atari
   <item>atmos
   <item>c16 (works also for the c116 with memory up to 32K)
   <item>atari
   <item>atmos
   <item>c16 (works also for the c116 with memory up to 32K)

diff --git a/libsrc/apple2/apple2-stdmou.s b/libsrc/apple2/apple2-stdmou.s
index e07246fec014bc298d171c6ae4399279aec6eb59..1f76efe82ce15b5fe7cd120e0f6b9f2ee74a4d24 100644 (file)
--- a/libsrc/apple2/apple2-stdmou.s
+++ b/libsrc/apple2/apple2-stdmou.s
@@ -59,6 +59,7 @@ CMOVEY: jmp   $0000                   ; Move the cursor to Y coord
 
        .bss
 
 
        .bss
 

+info:  .tag    MOUSE_INFO

 slot:  .res    1
 visible:.res   1
 
 slot:  .res    1
 visible:.res   1
 


@@ -82,10 +83,6 @@ size = * - values
 
        .data
 
 
        .data
 

-info:  .word   279 / 2         ; MOUSE_INFO::MOUSE_POS::XCOORD
-       .word   191 / 2         ; MOUSE_INFO::MOUSE_POS::YCOORD
-       .byte   %00000000       ; MOUSE_INFO::BUTTONS
-

 firmware:
        ; Lookup and patch firmware address lobyte
 lookup: ldy    $FF00,x         ; Patched at runtime
 firmware:
        ; Lookup and patch firmware address lobyte
 lookup: ldy    $FF00,x         ; Patched at runtime


@@ -192,6 +189,9 @@ next:       inc     ptr1+1
        ldx     #POSMOUSE
        jsr     firmware
 
        ldx     #POSMOUSE
        jsr     firmware
 

+       ; Update cursor
+       jsr     update
+

        ; Turn VBL interrupt on
        lda     #%00001001
        ldx     #SETMOUSE
        ; Turn VBL interrupt on
        lda     #%00001001
        ldx     #SETMOUSE