diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:37:00 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-09 23:37:00 +0200 |
| commit | 42bf12c2d3b2903a127f625dea0d3516a87debfa (patch) | |
| tree | 7fe1a2c4a3c250d44b9ff2a8bdf3809104744eb9 /vidix/nvidia_vid.c | |
| parent | fa34ea27b94cd870ec56de4ce215bf797054119f (diff) | |
| parent | 3c514ea708749679623ae04fc8f7ade87e51aade (diff) | |
| download | mpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.bz2 mpv-42bf12c2d3b2903a127f625dea0d3516a87debfa.tar.xz | |
Merge svn changes up to r30595
Conflicts:
mplayer.c
vidix/nvidia_vid.c
Diffstat (limited to 'vidix/nvidia_vid.c')
| -rw-r--r-- | vidix/nvidia_vid.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vidix/nvidia_vid.c b/vidix/nvidia_vid.c index 79f3880ebd..6c3786a815 100644 --- a/vidix/nvidia_vid.c +++ b/vidix/nvidia_vid.c @@ -441,12 +441,14 @@ struct rivatv_info { }; typedef struct rivatv_info rivatv_info; -static uint8_t nvReadVGA (struct rivatv_chip *chip, int index) { +static uint8_t nvReadVGA(struct rivatv_chip *chip, int index) +{ VID_WR08 (chip->PCIO, 0x3D4, index); return VID_RD08 (chip->PCIO, 0x3D5); } -static void nvWriteVGA (struct rivatv_chip *chip, int index, int data) { +static void nvWriteVGA(struct rivatv_chip *chip, int index, int data) +{ VID_WR08 (chip->PCIO, 0x3D4, index); VID_WR08 (chip->PCIO, 0x3D5, data); } |