i810: Move into a legacy directory.

The driver is still built but is no longer under active development so
move it and supporting files to a new directory.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
(cherry picked from commit 797d173a9af12055ba2609293182b616dd673ef4)

    Conflicts:

    	configure.ac
    	src/Makefile.am
    	src/common.h
    	src/i830.h
    	src/i830_accel.c
    	src/i830_batchbuffer.c
    	src/i830_driver.c
    	src/legacy/i810/i810_driver.c

OGA: had to make abunch of changes due to ums still existing, but this
was more sensible that having to modify every single cherry-picked patch
from now on.

1 files changed, 99 insertions, 5 deletions

diff --git a/src/i830_io.c b/src/i830_io.c
index 8006789d..c1c833f7 100644
--- a/src/i830_io.c
+++ b/src/i830_io.c
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-Copyright 2005 Red Hat, Inc.
+Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
 All Rights Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a
@@ -18,18 +18,112 @@ of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL RED HAT, INC AND/OR ITS SUPPLIERS BE LIABLE FOR
+IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
 ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
 TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /*
  * Authors:
- *   Kristian Høgsberg <krh@redhat.com>
+ *   Daryll Strauss <daryll@precisioninsight.com>
  *
  */
 
-#define BUILD_FOR_I830 1
-#include "i810_io.c"
+#include "xf86.h"
+#include "xf86_OSproc.h"
+#include "compiler.h"
+
+#include "i830.h"
+#define pI810 intel
+#define I810Ptr intel_screen_private *
+#define I810WriteControlPIO I830WriteControlPIO
+#define I810ReadControlPIO I830ReadControlPIO
+#define I810WriteStandardPIO I830WriteStandardPIO
+#define I810ReadStandardPIO I830ReadStandardPIO
+#define I810SetPIOAccess I830SetPIOAccess
+#define I810WriteControlMMIO I830WriteControlMMIO
+#define I810ReadControlMMIO I830ReadControlMMIO
+#define I810WriteStandardMMIO I830WriteStandardMMIO
+#define I810ReadStandardMMIO I830ReadStandardMMIO
+#define I810SetMMIOAccess I830SetMMIOAccess
+
+#define minb(p) *(volatile uint8_t *)(pI810->MMIOBase + (p))
+#define moutb(p,v) *(volatile uint8_t *)(pI810->MMIOBase + (p)) = (v)
+
+static void
+I810WriteControlPIO(I810Ptr pI810, IOADDRESS addr, uint8_t index, uint8_t val)
+{
+   addr += pI810->ioBase;
+   outb(addr, index);
+   outb(addr + 1, val);
+}
+
+static uint8_t
+I810ReadControlPIO(I810Ptr pI810, IOADDRESS addr, uint8_t index)
+{
+   addr += pI810->ioBase;
+   outb(addr, index);
+   return inb(addr + 1);
+}
+
+static void
+I810WriteStandardPIO(I810Ptr pI810, IOADDRESS addr, uint8_t val)
+{
+   outb(pI810->ioBase + addr, val);
+}
+
+static uint8_t
+I810ReadStandardPIO(I810Ptr pI810, IOADDRESS addr)
+{
+   return inb(pI810->ioBase + addr);
+}
+
+void
+I810SetPIOAccess(I810Ptr pI810)
+{
+   pI810->writeControl = I810WriteControlPIO;
+   pI810->readControl = I810ReadControlPIO;
+   pI810->writeStandard = I810WriteStandardPIO;
+   pI810->readStandard = I810ReadStandardPIO;
+}
+
+static void
+I810WriteControlMMIO(I810Ptr pI810, IOADDRESS addr, uint8_t index, uint8_t val)
+{
+   moutb(addr, index);
+   moutb(addr + 1, val);
+}
+
+static uint8_t
+I810ReadControlMMIO(I810Ptr pI810, IOADDRESS addr, uint8_t index)
+{
+   moutb(addr, index);
+   return minb(addr + 1);
+}
+
+static void
+I810WriteStandardMMIO(I810Ptr pI810, IOADDRESS addr, uint8_t val)
+{
+   moutb(addr, val);
+}
+
+static uint8_t
+I810ReadStandardMMIO(I810Ptr pI810, IOADDRESS addr)
+{
+   return minb(addr);
+}
+
+void
+I810SetMMIOAccess(I810Ptr pI810)
+{
+   pI810->writeControl = I810WriteControlMMIO;
+   pI810->readControl = I810ReadControlMMIO;
+   pI810->writeStandard = I810WriteStandardMMIO;
+   pI810->readStandard = I810ReadStandardMMIO;
+}