* [PATCH v2 1/4] input: docs: Fix broken table formatting
2025-05-26 13:59 [PATCH v2 0/4] Multiple fixes to Amiga joystick documentation George Anthony Vernon
@ 2025-05-26 13:59 ` George Anthony Vernon
2025-05-26 13:59 ` [PATCH v2 2/4] input: docs: Correct Amiga 4-jstick adapter pinout George Anthony Vernon
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: George Anthony Vernon @ 2025-05-26 13:59 UTC (permalink / raw)
To: dmitry.torokhov, corbet, skhan
Cc: George Anthony Vernon, bagasdotme, linux-input, linux-doc,
linux-kernel, linux-kernel-mentees
Missing '+' led to unintended spanning cell. Correct this.
Signed-off-by: George Anthony Vernon <contact@gvernon.com>
Reviewed-by: Bagas Sanjaya <bagasdotme@gmail.com>
---
Documentation/input/devices/amijoy.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/input/devices/amijoy.rst b/Documentation/input/devices/amijoy.rst
index 8df7b11cd98d..f854ee975247 100644
--- a/Documentation/input/devices/amijoy.rst
+++ b/Documentation/input/devices/amijoy.rst
@@ -123,7 +123,7 @@ JOY1DAT Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 X7 X6 X5 X4 X3 X2 X1 X0
clocked by 2 of the signals input from the mouse serial
stream. Starting with first bit received:
- +-------------------+-----------------------------------------+
+ +--------+----------+-----------------------------------------+
| Serial | Bit Name | Description |
+========+==========+=========================================+
| 0 | M0H | JOY0DAT Horizontal Clock |
--
2.49.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 2/4] input: docs: Correct Amiga 4-jstick adapter pinout
2025-05-26 13:59 [PATCH v2 0/4] Multiple fixes to Amiga joystick documentation George Anthony Vernon
2025-05-26 13:59 ` [PATCH v2 1/4] input: docs: Fix broken table formatting George Anthony Vernon
@ 2025-05-26 13:59 ` George Anthony Vernon
2025-05-26 13:59 ` [PATCH v2 3/4] input: docs: Fix Amiga joysticks grammar George Anthony Vernon
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: George Anthony Vernon @ 2025-05-26 13:59 UTC (permalink / raw)
To: dmitry.torokhov, corbet, skhan
Cc: George Anthony Vernon, bagasdotme, linux-input, linux-doc,
linux-kernel, linux-kernel-mentees
Pinout incorrectly duplicated pin 18, correct this.
Signed-off-by: George Anthony Vernon <contact@gvernon.com>
---
Documentation/input/devices/amijoy.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/input/devices/amijoy.rst b/Documentation/input/devices/amijoy.rst
index f854ee975247..ea4de1ac0360 100644
--- a/Documentation/input/devices/amijoy.rst
+++ b/Documentation/input/devices/amijoy.rst
@@ -17,7 +17,7 @@ Pin Meaning Pin Meaning
4 Left1 8 Left2
5 Right1 9 Right2
13 Fire1 11 Fire2
-18 Gnd1 18 Gnd2
+19 Gnd1 18 Gnd2
===== ======== ==== ==========
Amiga digital joystick pinout
--
2.49.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* [PATCH v2 3/4] input: docs: Fix Amiga joysticks grammar
2025-05-26 13:59 [PATCH v2 0/4] Multiple fixes to Amiga joystick documentation George Anthony Vernon
2025-05-26 13:59 ` [PATCH v2 1/4] input: docs: Fix broken table formatting George Anthony Vernon
2025-05-26 13:59 ` [PATCH v2 2/4] input: docs: Correct Amiga 4-jstick adapter pinout George Anthony Vernon
@ 2025-05-26 13:59 ` George Anthony Vernon
2025-05-29 1:20 ` Bagas Sanjaya
2025-05-29 1:23 ` Bagas Sanjaya
2025-05-26 13:59 ` [PATCH v2 4/4] input: docs: Make headings compliant w/ guidelines George Anthony Vernon
2025-05-30 22:35 ` [PATCH v2 0/4] Multiple fixes to Amiga joystick documentation Dmitry Torokhov
4 siblings, 2 replies; 9+ messages in thread
From: George Anthony Vernon @ 2025-05-26 13:59 UTC (permalink / raw)
To: dmitry.torokhov, corbet, skhan
Cc: George Anthony Vernon, bagasdotme, linux-input, linux-doc,
linux-kernel, linux-kernel-mentees
Make small grammar fixes to Amiga joystick documentation.
Signed-off-by: George Anthony Vernon <contact@gvernon.com>
---
Documentation/input/devices/amijoy.rst | 85 +++++++++++++-------------
1 file changed, 42 insertions(+), 43 deletions(-)
diff --git a/Documentation/input/devices/amijoy.rst b/Documentation/input/devices/amijoy.rst
index ea4de1ac0360..cbc5240f8af3 100644
--- a/Documentation/input/devices/amijoy.rst
+++ b/Documentation/input/devices/amijoy.rst
@@ -1,14 +1,13 @@
-~~~~~~~~~~~~~~~~~~~~~~~~~
-Amiga joystick extensions
-~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~
+Amiga joysticks
+~~~~~~~~~~~~~~~
-Amiga 4-joystick parport extension
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Amiga 4-joystick parallel port extension
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Parallel port pins:
-
===== ======== ==== ==========
Pin Meaning Pin Meaning
===== ======== ==== ==========
@@ -90,17 +89,17 @@ Pin Meaning
-------------------------------------------------------------------------------
-======== === ==== ==== ====== ========================================
+======== === ==== ==== ====== ===========================================
NAME rev ADDR type chip Description
-======== === ==== ==== ====== ========================================
-JOY0DAT 00A R Denise Joystick-mouse 0 data (left vert, horiz)
-JOY1DAT 00C R Denise Joystick-mouse 1 data (right vert,horiz)
-======== === ==== ==== ====== ========================================
+======== === ==== ==== ====== ===========================================
+JOY0DAT 00A R Denise Joystick-mouse 0 data (left vert., horiz.)
+JOY1DAT 00C R Denise Joystick-mouse 1 data (right vert., horiz.)
+======== === ==== ==== ====== ===========================================
These addresses each read a 16 bit register. These in turn
are loaded from the MDAT serial stream and are clocked in on
the rising edge of SCLK. MLD output is used to parallel load
- the external parallel-to-serial converter.This in turn is
+ the external parallel-to-serial converter. This in turn is
loaded with the 4 quadrature inputs from each of two game
controller ports (8 total) plus 8 miscellaneous control bits
which are new for LISA and can be read in upper 8 bits of
@@ -108,7 +107,7 @@ JOY1DAT 00C R Denise Joystick-mouse 1 data (right vert,horiz)
Register bits are as follows:
- - Mouse counter usage (pins 1,3 =Yclock, pins 2,4 =Xclock)
+ - Mouse counter usage (pins 1,3 =Yclock, pins 2,4 =Xclock)
======== === === === === === === === === ====== === === === === === === ===
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.
-------------------------------------------------------------------------------
-======= === ==== ==== ====== ========================================
+======= === ==== ==== ====== ===========================================
NAME rev ADDR type chip Description
-======= === ==== ==== ====== ========================================
-POT0DAT h 012 R Paula Pot counter data left pair (vert, horiz)
-POT1DAT h 014 R Paula Pot counter data right pair (vert,horiz)
-======= === ==== ==== ====== ========================================
+======= === ==== ==== ====== ===========================================
+POT0DAT h 012 R Paula Pot counter data left pair (vert., horiz.)
+POT1DAT h 014 R Paula Pot counter data right pair (vert., horiz.)
+======= === ==== ==== ====== ===========================================
These addresses each read a pair of 8 bit pot counters.
(4 counters total). The bit assignment for both
@@ -213,8 +212,8 @@ POT1DAT h 014 R Paula Pot counter data right pair (vert,horiz)
+-------+------+-----+-----+-------+
With normal (NTSC or PAL) horiz. line rate, the pots will
- give a full scale (FF) reading with about 500kohms in one
- frame time. With proportionally faster horiz line times,
+ give a full scale (FF) reading with about 500k ohm in one
+ frame time. With proportionally faster horiz. line times,
the counters will count proportionally faster.
This should be noted when doing variable beam displays.
@@ -238,26 +237,26 @@ POTINP 016 R Paula Pot pin data read
This register controls a 4 bit bi-direction I/O port
that shares the same 4 pins as the 4 pot counters above.
- +-------+----------+---------------------------------------------+
- | BIT# | FUNCTION | DESCRIPTION |
- +=======+==========+=============================================+
- | 15 | OUTRY | Output enable for Paula pin 33 |
- +-------+----------+---------------------------------------------+
- | 14 | DATRY | I/O data Paula pin 33 |
- +-------+----------+---------------------------------------------+
- | 13 | OUTRX | Output enable for Paula pin 32 |
- +-------+----------+---------------------------------------------+
- | 12 | DATRX | I/O data Paula pin 32 |
- +-------+----------+---------------------------------------------+
- | 11 | OUTLY | Out put enable for Paula pin 36 |
- +-------+----------+---------------------------------------------+
- | 10 | DATLY | I/O data Paula pin 36 |
- +-------+----------+---------------------------------------------+
- | 09 | OUTLX | Output enable for Paula pin 35 |
- +-------+----------+---------------------------------------------+
- | 08 | DATLX | I/O data Paula pin 35 |
- +-------+----------+---------------------------------------------+
- | 07-01 | X | Not used |
- +-------+----------+---------------------------------------------+
- | 00 | START | Start pots (dump capacitors,start counters) |
- +-------+----------+---------------------------------------------+
+ +-------+----------+----------------------------------------------+
+ | BIT# | FUNCTION | DESCRIPTION |
+ +=======+==========+==============================================+
+ | 15 | OUTRY | Output enable for Paula pin 33 |
+ +-------+----------+----------------------------------------------+
+ | 14 | DATRY | I/O data Paula pin 33 |
+ +-------+----------+----------------------------------------------+
+ | 13 | OUTRX | Output enable for Paula pin 32 |
+ +-------+----------+----------------------------------------------+
+ | 12 | DATRX | I/O data Paula pin 32 |
+ +-------+----------+----------------------------------------------+
+ | 11 | OUTLY | Out put enable for Paula pin 36 |
+ +-------+----------+----------------------------------------------+
+ | 10 | DATLY | I/O data Paula pin 36 |
+ +-------+----------+----------------------------------------------+
+ | 09 | OUTLX | Output enable for Paula pin 35 |
+ +-------+----------+----------------------------------------------+
+ | 08 | DATLX | I/O data Paula pin 35 |
+ +-------+----------+----------------------------------------------+
+ | 07-01 | X | Not used |
+ +-------+----------+----------------------------------------------+
+ | 00 | START | Start pots (dump capacitors, start counters) |
+ +-------+----------+----------------------------------------------+
--
2.49.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 3/4] input: docs: Fix Amiga joysticks grammar
2025-05-26 13:59 ` [PATCH v2 3/4] input: docs: Fix Amiga joysticks grammar George Anthony Vernon
@ 2025-05-29 1:20 ` Bagas Sanjaya
2025-05-29 1:23 ` Bagas Sanjaya
1 sibling, 0 replies; 9+ messages in thread
From: Bagas Sanjaya @ 2025-05-29 1:20 UTC (permalink / raw)
To: George Anthony Vernon, dmitry.torokhov, corbet, skhan
Cc: linux-input, linux-doc, linux-kernel, linux-kernel-mentees
[-- Attachment #1: Type: text/plain, Size: 8589 bytes --]
On Mon, May 26, 2025 at 02:59:51PM +0100, George Anthony Vernon wrote:
> diff --git a/Documentation/input/devices/amijoy.rst b/Documentation/input/devices/amijoy.rst
> index ea4de1ac0360..cbc5240f8af3 100644
> --- a/Documentation/input/devices/amijoy.rst
> +++ b/Documentation/input/devices/amijoy.rst
> @@ -1,14 +1,13 @@
> -~~~~~~~~~~~~~~~~~~~~~~~~~
> -Amiga joystick extensions
> -~~~~~~~~~~~~~~~~~~~~~~~~~
> +~~~~~~~~~~~~~~~
> +Amiga joysticks
> +~~~~~~~~~~~~~~~
>
>
> -Amiga 4-joystick parport extension
> -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> +Amiga 4-joystick parallel port extension
> +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Parallel port pins:
>
> -
> ===== ======== ==== ==========
> Pin Meaning Pin Meaning
> ===== ======== ==== ==========
> @@ -90,17 +89,17 @@ Pin Meaning
>
> -------------------------------------------------------------------------------
>
> -======== === ==== ==== ====== ========================================
> +======== === ==== ==== ====== ===========================================
> NAME rev ADDR type chip Description
> -======== === ==== ==== ====== ========================================
> -JOY0DAT 00A R Denise Joystick-mouse 0 data (left vert, horiz)
> -JOY1DAT 00C R Denise Joystick-mouse 1 data (right vert,horiz)
> -======== === ==== ==== ====== ========================================
> +======== === ==== ==== ====== ===========================================
> +JOY0DAT 00A R Denise Joystick-mouse 0 data (left vert., horiz.)
> +JOY1DAT 00C R Denise Joystick-mouse 1 data (right vert., horiz.)
> +======== === ==== ==== ====== ===========================================
>
> These addresses each read a 16 bit register. These in turn
> are loaded from the MDAT serial stream and are clocked in on
> the rising edge of SCLK. MLD output is used to parallel load
> - the external parallel-to-serial converter.This in turn is
> + the external parallel-to-serial converter. This in turn is
> loaded with the 4 quadrature inputs from each of two game
> controller ports (8 total) plus 8 miscellaneous control bits
> which are new for LISA and can be read in upper 8 bits of
> @@ -108,7 +107,7 @@ JOY1DAT 00C R Denise Joystick-mouse 1 data (right vert,horiz)
>
> Register bits are as follows:
>
> - - Mouse counter usage (pins 1,3 =Yclock, pins 2,4 =Xclock)
> + - Mouse counter usage (pins 1,3 =Yclock, pins 2,4 =Xclock)
>
> ======== === === === === === === === === ====== === === === === === === ===
> 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.
>
> -------------------------------------------------------------------------------
>
> -======= === ==== ==== ====== ========================================
> +======= === ==== ==== ====== ===========================================
> NAME rev ADDR type chip Description
> -======= === ==== ==== ====== ========================================
> -POT0DAT h 012 R Paula Pot counter data left pair (vert, horiz)
> -POT1DAT h 014 R Paula Pot counter data right pair (vert,horiz)
> -======= === ==== ==== ====== ========================================
> +======= === ==== ==== ====== ===========================================
> +POT0DAT h 012 R Paula Pot counter data left pair (vert., horiz.)
> +POT1DAT h 014 R Paula Pot counter data right pair (vert., horiz.)
> +======= === ==== ==== ====== ===========================================
>
> These addresses each read a pair of 8 bit pot counters.
> (4 counters total). The bit assignment for both
> @@ -213,8 +212,8 @@ POT1DAT h 014 R Paula Pot counter data right pair (vert,horiz)
> +-------+------+-----+-----+-------+
>
> With normal (NTSC or PAL) horiz. line rate, the pots will
> - give a full scale (FF) reading with about 500kohms in one
> - frame time. With proportionally faster horiz line times,
> + give a full scale (FF) reading with about 500k ohm in one
> + frame time. With proportionally faster horiz. line times,
> the counters will count proportionally faster.
> This should be noted when doing variable beam displays.
>
> @@ -238,26 +237,26 @@ POTINP 016 R Paula Pot pin data read
> This register controls a 4 bit bi-direction I/O port
> that shares the same 4 pins as the 4 pot counters above.
>
> - +-------+----------+---------------------------------------------+
> - | BIT# | FUNCTION | DESCRIPTION |
> - +=======+==========+=============================================+
> - | 15 | OUTRY | Output enable for Paula pin 33 |
> - +-------+----------+---------------------------------------------+
> - | 14 | DATRY | I/O data Paula pin 33 |
> - +-------+----------+---------------------------------------------+
> - | 13 | OUTRX | Output enable for Paula pin 32 |
> - +-------+----------+---------------------------------------------+
> - | 12 | DATRX | I/O data Paula pin 32 |
> - +-------+----------+---------------------------------------------+
> - | 11 | OUTLY | Out put enable for Paula pin 36 |
> - +-------+----------+---------------------------------------------+
> - | 10 | DATLY | I/O data Paula pin 36 |
> - +-------+----------+---------------------------------------------+
> - | 09 | OUTLX | Output enable for Paula pin 35 |
> - +-------+----------+---------------------------------------------+
> - | 08 | DATLX | I/O data Paula pin 35 |
> - +-------+----------+---------------------------------------------+
> - | 07-01 | X | Not used |
> - +-------+----------+---------------------------------------------+
> - | 00 | START | Start pots (dump capacitors,start counters) |
> - +-------+----------+---------------------------------------------+
> + +-------+----------+----------------------------------------------+
> + | BIT# | FUNCTION | DESCRIPTION |
> + +=======+==========+==============================================+
> + | 15 | OUTRY | Output enable for Paula pin 33 |
> + +-------+----------+----------------------------------------------+
> + | 14 | DATRY | I/O data Paula pin 33 |
> + +-------+----------+----------------------------------------------+
> + | 13 | OUTRX | Output enable for Paula pin 32 |
> + +-------+----------+----------------------------------------------+
> + | 12 | DATRX | I/O data Paula pin 32 |
> + +-------+----------+----------------------------------------------+
> + | 11 | OUTLY | Out put enable for Paula pin 36 |
> + +-------+----------+----------------------------------------------+
> + | 10 | DATLY | I/O data Paula pin 36 |
> + +-------+----------+----------------------------------------------+
> + | 09 | OUTLX | Output enable for Paula pin 35 |
> + +-------+----------+----------------------------------------------+
> + | 08 | DATLX | I/O data Paula pin 35 |
> + +-------+----------+----------------------------------------------+
> + | 07-01 | X | Not used |
> + +-------+----------+----------------------------------------------+
> + | 00 | START | Start pots (dump capacitors, start counters) |
> + +-------+----------+----------------------------------------------+
LGTM, thanks!
Reviewed-by: Bagas Sanjaya <bagasdotme@gmail.com>
--
An old man doll... just what I always wanted! - Clara
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 3/4] input: docs: Fix Amiga joysticks grammar
2025-05-26 13:59 ` [PATCH v2 3/4] input: docs: Fix Amiga joysticks grammar George Anthony Vernon
2025-05-29 1:20 ` Bagas Sanjaya
@ 2025-05-29 1:23 ` Bagas Sanjaya
1 sibling, 0 replies; 9+ messages in thread
From: Bagas Sanjaya @ 2025-05-29 1:23 UTC (permalink / raw)
To: George Anthony Vernon, dmitry.torokhov, corbet, skhan
Cc: linux-input, linux-doc, linux-kernel, linux-kernel-mentees
[-- Attachment #1: Type: text/plain, Size: 3890 bytes --]
On Mon, May 26, 2025 at 02:59:51PM +0100, George Anthony Vernon wrote:
> - +-------+----------+---------------------------------------------+
> - | BIT# | FUNCTION | DESCRIPTION |
> - +=======+==========+=============================================+
> - | 15 | OUTRY | Output enable for Paula pin 33 |
> - +-------+----------+---------------------------------------------+
> - | 14 | DATRY | I/O data Paula pin 33 |
> - +-------+----------+---------------------------------------------+
> - | 13 | OUTRX | Output enable for Paula pin 32 |
> - +-------+----------+---------------------------------------------+
> - | 12 | DATRX | I/O data Paula pin 32 |
> - +-------+----------+---------------------------------------------+
> - | 11 | OUTLY | Out put enable for Paula pin 36 |
> - +-------+----------+---------------------------------------------+
> - | 10 | DATLY | I/O data Paula pin 36 |
> - +-------+----------+---------------------------------------------+
> - | 09 | OUTLX | Output enable for Paula pin 35 |
> - +-------+----------+---------------------------------------------+
> - | 08 | DATLX | I/O data Paula pin 35 |
> - +-------+----------+---------------------------------------------+
> - | 07-01 | X | Not used |
> - +-------+----------+---------------------------------------------+
> - | 00 | START | Start pots (dump capacitors,start counters) |
> - +-------+----------+---------------------------------------------+
> + +-------+----------+----------------------------------------------+
> + | BIT# | FUNCTION | DESCRIPTION |
> + +=======+==========+==============================================+
> + | 15 | OUTRY | Output enable for Paula pin 33 |
> + +-------+----------+----------------------------------------------+
> + | 14 | DATRY | I/O data Paula pin 33 |
> + +-------+----------+----------------------------------------------+
> + | 13 | OUTRX | Output enable for Paula pin 32 |
> + +-------+----------+----------------------------------------------+
> + | 12 | DATRX | I/O data Paula pin 32 |
> + +-------+----------+----------------------------------------------+
> + | 11 | OUTLY | Out put enable for Paula pin 36 |
"Output"
> + +-------+----------+----------------------------------------------+
> + | 10 | DATLY | I/O data Paula pin 36 |
> + +-------+----------+----------------------------------------------+
> + | 09 | OUTLX | Output enable for Paula pin 35 |
> + +-------+----------+----------------------------------------------+
> + | 08 | DATLX | I/O data Paula pin 35 |
> + +-------+----------+----------------------------------------------+
> + | 07-01 | X | Not used |
> + +-------+----------+----------------------------------------------+
> + | 00 | START | Start pots (dump capacitors, start counters) |
> + +-------+----------+----------------------------------------------+
Thanks.
--
An old man doll... just what I always wanted! - Clara
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2 4/4] input: docs: Make headings compliant w/ guidelines
2025-05-26 13:59 [PATCH v2 0/4] Multiple fixes to Amiga joystick documentation George Anthony Vernon
` (2 preceding siblings ...)
2025-05-26 13:59 ` [PATCH v2 3/4] input: docs: Fix Amiga joysticks grammar George Anthony Vernon
@ 2025-05-26 13:59 ` George Anthony Vernon
2025-05-29 1:20 ` Bagas Sanjaya
2025-05-30 22:35 ` [PATCH v2 0/4] Multiple fixes to Amiga joystick documentation Dmitry Torokhov
4 siblings, 1 reply; 9+ messages in thread
From: George Anthony Vernon @ 2025-05-26 13:59 UTC (permalink / raw)
To: dmitry.torokhov, corbet, skhan
Cc: George Anthony Vernon, bagasdotme, linux-input, linux-doc,
linux-kernel, linux-kernel-mentees
Make heading adornments compliant with the guidelines to improve
organisation of the page.
Signed-off-by: George Anthony Vernon <contact@gvernon.com>
---
Documentation/input/devices/amijoy.rst | 42 ++++++++++++++++----------
1 file changed, 26 insertions(+), 16 deletions(-)
diff --git a/Documentation/input/devices/amijoy.rst b/Documentation/input/devices/amijoy.rst
index cbc5240f8af3..a81e9de481c7 100644
--- a/Documentation/input/devices/amijoy.rst
+++ b/Documentation/input/devices/amijoy.rst
@@ -1,10 +1,12 @@
-~~~~~~~~~~~~~~~
+===============
Amiga joysticks
-~~~~~~~~~~~~~~~
+===============
+Pinouts
+=======
Amiga 4-joystick parallel port extension
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+----------------------------------------
Parallel port pins:
@@ -19,8 +21,8 @@ Pin Meaning Pin Meaning
19 Gnd1 18 Gnd2
===== ======== ==== ==========
-Amiga digital joystick pinout
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Amiga digital joystick
+----------------------
=== ============
Pin Meaning
@@ -36,8 +38,8 @@ Pin Meaning
9 Thumb button
=== ============
-Amiga mouse pinout
-~~~~~~~~~~~~~~~~~~
+Amiga mouse
+-----------
=== ============
Pin Meaning
@@ -53,8 +55,8 @@ Pin Meaning
9 Right button
=== ============
-Amiga analog joystick pinout
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Amiga analog joystick
+---------------------
=== ==============
Pin Meaning
@@ -70,8 +72,8 @@ Pin Meaning
9 Analog Y
=== ==============
-Amiga lightpen pinout
-~~~~~~~~~~~~~~~~~~~~~
+Amiga lightpen
+--------------
=== =============
Pin Meaning
@@ -87,7 +89,11 @@ Pin Meaning
9 Stylus button
=== =============
--------------------------------------------------------------------------------
+Register addresses
+==================
+
+JOY0DAT/JOY1DAT
+---------------
======== === ==== ==== ====== ===========================================
NAME rev ADDR type chip Description
@@ -159,7 +165,8 @@ JOY1DAT Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 X7 X6 X5 X4 X3 X2 X1 X0
| Right | 4 | X1 |
+------------+------+---------------------------------+
--------------------------------------------------------------------------------
+JOYTEST
+-------
======== === ==== ==== ====== =================================================
NAME rev ADDR type chip Description
@@ -176,7 +183,8 @@ JOYTEST 036 W Denise Write to all 4 joystick-mouse counters at once.
JOYxDAT Y7 Y6 Y5 Y4 Y3 Y2 xx xx X7 X6 X5 X4 X3 X2 xx xx
========= === === === === === === === === ====== === === === === === === ===
--------------------------------------------------------------------------------
+POT0DAT/POT1DAT
+---------------
======= === ==== ==== ====== ===========================================
NAME rev ADDR type chip Description
@@ -217,7 +225,8 @@ POT1DAT h 014 R Paula Pot counter data right pair (vert., horiz.)
the counters will count proportionally faster.
This should be noted when doing variable beam displays.
--------------------------------------------------------------------------------
+POTGO
+-----
====== === ==== ==== ====== ================================================
NAME rev ADDR type chip Description
@@ -226,7 +235,8 @@ POTGO 034 W Paula Pot port (4 bit) bi-direction and data, and pot
counter start.
====== === ==== ==== ====== ================================================
--------------------------------------------------------------------------------
+POTINP
+------
====== === ==== ==== ====== ================================================
NAME rev ADDR type chip Description
--
2.49.0
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH v2 4/4] input: docs: Make headings compliant w/ guidelines
2025-05-26 13:59 ` [PATCH v2 4/4] input: docs: Make headings compliant w/ guidelines George Anthony Vernon
@ 2025-05-29 1:20 ` Bagas Sanjaya
0 siblings, 0 replies; 9+ messages in thread
From: Bagas Sanjaya @ 2025-05-29 1:20 UTC (permalink / raw)
To: George Anthony Vernon, dmitry.torokhov, corbet, skhan
Cc: linux-input, linux-doc, linux-kernel, linux-kernel-mentees
[-- Attachment #1: Type: text/plain, Size: 4011 bytes --]
On Mon, May 26, 2025 at 02:59:52PM +0100, George Anthony Vernon wrote:
> diff --git a/Documentation/input/devices/amijoy.rst b/Documentation/input/devices/amijoy.rst
> index cbc5240f8af3..a81e9de481c7 100644
> --- a/Documentation/input/devices/amijoy.rst
> +++ b/Documentation/input/devices/amijoy.rst
> @@ -1,10 +1,12 @@
> -~~~~~~~~~~~~~~~
> +===============
> Amiga joysticks
> -~~~~~~~~~~~~~~~
> +===============
>
> +Pinouts
> +=======
>
> Amiga 4-joystick parallel port extension
> -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> +----------------------------------------
>
> Parallel port pins:
>
> @@ -19,8 +21,8 @@ Pin Meaning Pin Meaning
> 19 Gnd1 18 Gnd2
> ===== ======== ==== ==========
>
> -Amiga digital joystick pinout
> -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> +Amiga digital joystick
> +----------------------
>
> === ============
> Pin Meaning
> @@ -36,8 +38,8 @@ Pin Meaning
> 9 Thumb button
> === ============
>
> -Amiga mouse pinout
> -~~~~~~~~~~~~~~~~~~
> +Amiga mouse
> +-----------
>
> === ============
> Pin Meaning
> @@ -53,8 +55,8 @@ Pin Meaning
> 9 Right button
> === ============
>
> -Amiga analog joystick pinout
> -~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> +Amiga analog joystick
> +---------------------
>
> === ==============
> Pin Meaning
> @@ -70,8 +72,8 @@ Pin Meaning
> 9 Analog Y
> === ==============
>
> -Amiga lightpen pinout
> -~~~~~~~~~~~~~~~~~~~~~
> +Amiga lightpen
> +--------------
>
> === =============
> Pin Meaning
> @@ -87,7 +89,11 @@ Pin Meaning
> 9 Stylus button
> === =============
>
> --------------------------------------------------------------------------------
> +Register addresses
> +==================
> +
> +JOY0DAT/JOY1DAT
> +---------------
>
> ======== === ==== ==== ====== ===========================================
> NAME rev ADDR type chip Description
> @@ -159,7 +165,8 @@ JOY1DAT Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 X7 X6 X5 X4 X3 X2 X1 X0
> | Right | 4 | X1 |
> +------------+------+---------------------------------+
>
> --------------------------------------------------------------------------------
> +JOYTEST
> +-------
>
> ======== === ==== ==== ====== =================================================
> NAME rev ADDR type chip Description
> @@ -176,7 +183,8 @@ JOYTEST 036 W Denise Write to all 4 joystick-mouse counters at once.
> JOYxDAT Y7 Y6 Y5 Y4 Y3 Y2 xx xx X7 X6 X5 X4 X3 X2 xx xx
> ========= === === === === === === === === ====== === === === === === === ===
>
> --------------------------------------------------------------------------------
> +POT0DAT/POT1DAT
> +---------------
>
> ======= === ==== ==== ====== ===========================================
> NAME rev ADDR type chip Description
> @@ -217,7 +225,8 @@ POT1DAT h 014 R Paula Pot counter data right pair (vert., horiz.)
> the counters will count proportionally faster.
> This should be noted when doing variable beam displays.
>
> --------------------------------------------------------------------------------
> +POTGO
> +-----
>
> ====== === ==== ==== ====== ================================================
> NAME rev ADDR type chip Description
> @@ -226,7 +235,8 @@ POTGO 034 W Paula Pot port (4 bit) bi-direction and data, and pot
> counter start.
> ====== === ==== ==== ====== ================================================
>
> --------------------------------------------------------------------------------
> +POTINP
> +------
>
> ====== === ==== ==== ====== ================================================
> NAME rev ADDR type chip Description
LGTM, thanks!
Reviewed-by: Bagas Sanjaya <bagasdotme@gmail.com>
--
An old man doll... just what I always wanted! - Clara
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2 0/4] Multiple fixes to Amiga joystick documentation
2025-05-26 13:59 [PATCH v2 0/4] Multiple fixes to Amiga joystick documentation George Anthony Vernon
` (3 preceding siblings ...)
2025-05-26 13:59 ` [PATCH v2 4/4] input: docs: Make headings compliant w/ guidelines George Anthony Vernon
@ 2025-05-30 22:35 ` Dmitry Torokhov
4 siblings, 0 replies; 9+ messages in thread
From: Dmitry Torokhov @ 2025-05-30 22:35 UTC (permalink / raw)
To: George Anthony Vernon
Cc: corbet, skhan, bagasdotme, linux-input, linux-doc, linux-kernel,
linux-kernel-mentees
On Mon, May 26, 2025 at 02:59:48PM +0100, George Anthony Vernon wrote:
> Hi, this patch series covers a few fixes & heading imps to the Amiga
> joystick documentation.
>
> I've kept the section adornments changes amid ongoing discussion about
> it.
Applied the lot, thank you.
--
Dmitry
^ permalink raw reply [flat|nested] 9+ messages in thread