Skip to content

Commit e846634

Browse files
manual: various fixes
Signed-off-by: Ivan Velickovic <i.velickovic@unsw.edu.au>
1 parent 8277625 commit e846634

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

docs/manual.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,8 @@ protection domain can only ever manage a single virtual machine.
212212

213213
A *memory region* is a range of memory.
214214

215-
A memory region has a *fixed* physical address if it:
215+
A memory region has a *fixed* physical address if it either:
216+
216217
1. has an explicitly defined physical address, or
217218
2. is a subject of a `setvar` element with a `region_paddr` attribute
218219
(See [System Description File](#sysdesc)). In this case
@@ -1025,17 +1026,17 @@ The `irq` element has the following attributes on ARM and RISC-V:
10251026
* `trigger`: (optional) Whether the IRQ is edge triggered ("edge") or level triggered ("level"). Defaults to "level".
10261027
* `setvar_id`: (optional) Specifies a symbol in the program image. This symbol will be rewritten with the channel identifier of the IRQ.
10271028

1028-
The `irq` element has the following attributes when registering X86_64 IOAPIC interrupts:
1029+
The `irq` element has the following attributes when registering x86-64 IOAPIC interrupts:
10291030

10301031
* `id`: The channel identifier. Must be at least 0 and less than 63.
10311032
* `pin`: IOAPIC pin that generates the interrupt.
10321033
* `vector`: CPU vector to deliver the interrupt to.
10331034
* `ioapic`: (optional) Zero based index of the IOAPIC to get the interrupt from. Defaults to 0.
1034-
* `level`: (optional) Whether the IRQ is level triggered (1) or edge triggered (0). Defaults to level (1).
1035-
* `polarity`: (optional) Whether the line polarity is high (1) or low (0). Defaults to high (1).
1035+
* `trigger`: (optional) Whether the IRQ is edge triggered ("edge") or level triggered ("level"). Defaults to "level".
1036+
* `polarity`: (optional) Whether the line polarity is high ("high") or low ("low"). Defaults to "high".
10361037
* `setvar_id`: (optional) Specifies a symbol in the program image. This symbol will be rewritten with the channel identifier of the IRQ.
10371038

1038-
The `irq` element has the following attributes when registering X86_64 MSI interrupts:
1039+
The `irq` element has the following attributes when registering x86-64 MSI interrupts:
10391040

10401041
* `id`: The channel identifier. Must be at least 0 and less than 63.
10411042
* `pcidev`: The PCI device address of the device that will generate the interrupt, in BUS:DEV:FUNC notation (e.g. 01:1f:2).

0 commit comments

Comments
 (0)