diff options
| author | Ben Skeggs <darktama@iinet.net.au> | 2006-08-28 14:46:51 +1000 |
|---|---|---|
| committer | Ben Skeggs <darktama@iinet.net.au> | 2006-08-28 14:46:51 +1000 |
| commit | 24267d7e39383930c589bc80e2bbd4e5cf66ec2a (patch) | |
| tree | 4573dba1ec5b533da5654636d18c1f1ef85e406e /src/nv_hw.c | |
| parent | 349496c97fafed04806c01bd9d4386b0fcaa9fd2 (diff) | |
| parent | c0154e615c091c7bb483fcfd07e216b21618d0f2 (diff) | |
| download | xorg-driver-xf86-video-nouveau-24267d7e39383930c589bc80e2bbd4e5cf66ec2a.tar.gz | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/nouveau/xf86-video-nouveau
Diffstat (limited to 'src/nv_hw.c')
| -rw-r--r-- | src/nv_hw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nv_hw.c b/src/nv_hw.c index a017a27..e6a3e10 100644 --- a/src/nv_hw.c +++ b/src/nv_hw.c @@ -42,14 +42,14 @@ #include "compiler.h" #include "nv_include.h" -static inline uint8_t nvReadVGA(NVPtr pNv, uint8_t index) +uint8_t nvReadVGA(NVPtr pNv, uint8_t index) { volatile const uint8_t *ptr = pNv->cur_head ? pNv->PCIO1 : pNv->PCIO0; VGA_WR08(ptr, 0x03D4, index); return VGA_RD08(ptr, 0x03D5); } -static inline void nvWriteVGA(NVPtr pNv, uint8_t index, uint8_t data) +void nvWriteVGA(NVPtr pNv, uint8_t index, uint8_t data) { volatile const uint8_t *ptr = pNv->cur_head ? pNv->PCIO1 : pNv->PCIO0; VGA_WR08(ptr, 0x03D4, index); |