Skip to content

Commit 11172ec

Browse files
g-vernondtor
g-vernon
authored and
dtor
committed
Input: amijoy - fix grammar in documentation
Make small grammar fixes to Amiga joystick documentation. Signed-off-by: George Anthony Vernon <contact@gvernon.com> Reviewed-by: Bagas Sanjaya <bagasdotme@gmail.com> Link: https://lore.kernel.org/r/20250526135957.180254-4-contact@gvernon.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
1 parent ed1d9c2 commit 11172ec

1 file changed

Lines changed: 42 additions & 43 deletions

File tree

‎Documentation/input/devices/amijoy.rst‎

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
~~~~~~~~~~~~~~~~~~~~~~~~~
2-
Amiga joystick extensions
3-
~~~~~~~~~~~~~~~~~~~~~~~~~
1+
~~~~~~~~~~~~~~~
2+
Amiga joysticks
3+
~~~~~~~~~~~~~~~
44

55

6-
Amiga 4-joystick parport extension
7-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
6+
Amiga 4-joystick parallel port extension
7+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
88

99
Parallel port pins:
1010

11-
1211
===== ======== ==== ==========
1312
Pin Meaning Pin Meaning
1413
===== ======== ==== ==========
@@ -90,25 +89,25 @@ Pin Meaning
9089

9190
-------------------------------------------------------------------------------
9291

93-
======== === ==== ==== ====== ========================================
92+
======== === ==== ==== ====== ===========================================
9493
NAME rev ADDR type chip Description
95-
======== === ==== ==== ====== ========================================
96-
JOY0DAT 00A R Denise Joystick-mouse 0 data (left vert, horiz)
97-
JOY1DAT 00C R Denise Joystick-mouse 1 data (right vert,horiz)
98-
======== === ==== ==== ====== ========================================
94+
======== === ==== ==== ====== ===========================================
95+
JOY0DAT 00A R Denise Joystick-mouse 0 data (left vert., horiz.)
96+
JOY1DAT 00C R Denise Joystick-mouse 1 data (right vert., horiz.)
97+
======== === ==== ==== ====== ===========================================
9998

10099
These addresses each read a 16 bit register. These in turn
101100
are loaded from the MDAT serial stream and are clocked in on
102101
the rising edge of SCLK. MLD output is used to parallel load
103-
the external parallel-to-serial converter.This in turn is
102+
the external parallel-to-serial converter. This in turn is
104103
loaded with the 4 quadrature inputs from each of two game
105104
controller ports (8 total) plus 8 miscellaneous control bits
106105
which are new for LISA and can be read in upper 8 bits of
107106
LISAID.
108107

109108
Register bits are as follows:
110109

111-
- Mouse counter usage (pins 1,3 =Yclock, pins 2,4 =Xclock)
110+
- Mouse counter usage (pins 1,3 =Yclock, pins 2,4 =Xclock)
112111

113112
======== === === === === === === === === ====== === === === === === === ===
114113
BIT# 15 14 13 12 11 10 09 08 07 06 05 04 03 02 01 00
@@ -179,12 +178,12 @@ JOYTEST 036 W Denise Write to all 4 joystick-mouse counters at once.
179178

180179
-------------------------------------------------------------------------------
181180

182-
======= === ==== ==== ====== ========================================
181+
======= === ==== ==== ====== ===========================================
183182
NAME rev ADDR type chip Description
184-
======= === ==== ==== ====== ========================================
185-
POT0DAT h 012 R Paula Pot counter data left pair (vert, horiz)
186-
POT1DAT h 014 R Paula Pot counter data right pair (vert,horiz)
187-
======= === ==== ==== ====== ========================================
183+
======= === ==== ==== ====== ===========================================
184+
POT0DAT h 012 R Paula Pot counter data left pair (vert., horiz.)
185+
POT1DAT h 014 R Paula Pot counter data right pair (vert., horiz.)
186+
======= === ==== ==== ====== ===========================================
188187

189188
These addresses each read a pair of 8 bit pot counters.
190189
(4 counters total). The bit assignment for both
@@ -213,8 +212,8 @@ POT1DAT h 014 R Paula Pot counter data right pair (vert,horiz)
213212
+-------+------+-----+-----+-------+
214213

215214
With normal (NTSC or PAL) horiz. line rate, the pots will
216-
give a full scale (FF) reading with about 500kohms in one
217-
frame time. With proportionally faster horiz line times,
215+
give a full scale (FF) reading with about 500k ohm in one
216+
frame time. With proportionally faster horiz. line times,
218217
the counters will count proportionally faster.
219218
This should be noted when doing variable beam displays.
220219

@@ -238,26 +237,26 @@ POTINP 016 R Paula Pot pin data read
238237
This register controls a 4 bit bi-direction I/O port
239238
that shares the same 4 pins as the 4 pot counters above.
240239

241-
+-------+----------+---------------------------------------------+
242-
| BIT# | FUNCTION | DESCRIPTION |
243-
+=======+==========+=============================================+
244-
| 15 | OUTRY | Output enable for Paula pin 33 |
245-
+-------+----------+---------------------------------------------+
246-
| 14 | DATRY | I/O data Paula pin 33 |
247-
+-------+----------+---------------------------------------------+
248-
| 13 | OUTRX | Output enable for Paula pin 32 |
249-
+-------+----------+---------------------------------------------+
250-
| 12 | DATRX | I/O data Paula pin 32 |
251-
+-------+----------+---------------------------------------------+
252-
| 11 | OUTLY | Out put enable for Paula pin 36 |
253-
+-------+----------+---------------------------------------------+
254-
| 10 | DATLY | I/O data Paula pin 36 |
255-
+-------+----------+---------------------------------------------+
256-
| 09 | OUTLX | Output enable for Paula pin 35 |
257-
+-------+----------+---------------------------------------------+
258-
| 08 | DATLX | I/O data Paula pin 35 |
259-
+-------+----------+---------------------------------------------+
260-
| 07-01 | X | Not used |
261-
+-------+----------+---------------------------------------------+
262-
| 00 | START | Start pots (dump capacitors,start counters) |
263-
+-------+----------+---------------------------------------------+
240+
+-------+----------+----------------------------------------------+
241+
| BIT# | FUNCTION | DESCRIPTION |
242+
+=======+==========+==============================================+
243+
| 15 | OUTRY | Output enable for Paula pin 33 |
244+
+-------+----------+----------------------------------------------+
245+
| 14 | DATRY | I/O data Paula pin 33 |
246+
+-------+----------+----------------------------------------------+
247+
| 13 | OUTRX | Output enable for Paula pin 32 |
248+
+-------+----------+----------------------------------------------+
249+
| 12 | DATRX | I/O data Paula pin 32 |
250+
+-------+----------+----------------------------------------------+
251+
| 11 | OUTLY | Out put enable for Paula pin 36 |
252+
+-------+----------+----------------------------------------------+
253+
| 10 | DATLY | I/O data Paula pin 36 |
254+
+-------+----------+----------------------------------------------+
255+
| 09 | OUTLX | Output enable for Paula pin 35 |
256+
+-------+----------+----------------------------------------------+
257+
| 08 | DATLX | I/O data Paula pin 35 |
258+
+-------+----------+----------------------------------------------+
259+
| 07-01 | X | Not used |
260+
+-------+----------+----------------------------------------------+
261+
| 00 | START | Start pots (dump capacitors, start counters) |
262+
+-------+----------+----------------------------------------------+

0 commit comments

Comments
 (0)