Commit 70cc0c1f authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Gerd Hoffmann
Browse files

hw/display/milkymist-tmu2: Move inlined code from header to source 



Move the complexity of milkymist_tmu2_create() into the
source file. Doing so we avoid to include the X11/OpenGL
headers in all LM32 devices, and we also avoid the duplicate
declaration of glx_fbconfig_attr[] (it is already declared
in hw/display/milkymist-tmu2.c).
Since TYPE_MILKYMIST_TMU2 is now accessible, use it.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20190130120005.23123-5-philmd@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent 57d43440

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ F: disas/lm32.c 
F: hw/lm32/

F: hw/*/lm32_*

F: hw/*/milkymist-*

F: include/hw/display/milkymist_tmu2.h

F: include/hw/char/lm32_juart.h

F: include/hw/lm32/

F: tests/tcg/lm32/

hw/display/milkymist-tmu2.c

+49 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "qapi/error.h"

#include "qemu/error-report.h"

#include "qapi/error.h"

#include "hw/display/milkymist_tmu2.h"



#include <X11/Xlib.h>

#include <epoxy/gl.h>
@@ -499,3 +500,51 @@ static void milkymist_tmu2_register_types(void) 
}



type_init(milkymist_tmu2_register_types)



DeviceState *milkymist_tmu2_create(hwaddr base, qemu_irq irq)

{

    DeviceState *dev;

    Display *d;

    GLXFBConfig *configs;

    int nelements;

    int ver_major, ver_minor;



    /* check that GLX will work */

    d = XOpenDisplay(NULL);

    if (d == NULL) {

        return NULL;

    }



    if (!glXQueryVersion(d, &ver_major, &ver_minor)) {

        /*

         * Yeah, sometimes getting the GLX version can fail.

         * Isn't X beautiful?

         */

        XCloseDisplay(d);

        return NULL;

    }



    if ((ver_major < 1) || ((ver_major == 1) && (ver_minor < 3))) {

        printf("Your GLX version is %d.%d,"

          "but TMU emulation needs at least 1.3. TMU disabled.\n",

          ver_major, ver_minor);

        XCloseDisplay(d);

        return NULL;

    }



    configs = glXChooseFBConfig(d, 0, glx_fbconfig_attr, &nelements);

    if (configs == NULL) {

        XCloseDisplay(d);

        return NULL;

    }



    XFree(configs);

    XCloseDisplay(d);



    dev = qdev_create(NULL, TYPE_MILKYMIST_TMU2);

    qdev_init_nofail(dev);

    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);

    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq);



    return dev;

}

hw/lm32/milkymist-hw.h

+0 −63
Original line number Diff line number Diff line
@@ -88,69 +88,6 @@ static inline DeviceState *milkymist_pfpu_create(hwaddr base, 
    return dev;

}



#if defined(CONFIG_X11) && defined(CONFIG_OPENGL)

#include <X11/Xlib.h>

#include <epoxy/gl.h>

#include <epoxy/glx.h>

static const int glx_fbconfig_attr[] = {

    GLX_GREEN_SIZE, 5,

    GLX_GREEN_SIZE, 6,

    GLX_BLUE_SIZE, 5,

    None

};

#endif



static inline DeviceState *milkymist_tmu2_create(hwaddr base,

        qemu_irq irq)

{

#if defined(CONFIG_X11) && defined(CONFIG_OPENGL)

    DeviceState *dev;

    Display *d;

    GLXFBConfig *configs;

    int nelements;

    int ver_major, ver_minor;



    /* check that GLX will work */

    d = XOpenDisplay(NULL);

    if (d == NULL) {

        return NULL;

    }



    if (!glXQueryVersion(d, &ver_major, &ver_minor)) {

        /* Yeah, sometimes getting the GLX version can fail.

         * Isn't X beautiful? */

        XCloseDisplay(d);

        return NULL;

    }



    if ((ver_major < 1) || ((ver_major == 1) && (ver_minor < 3))) {

        printf("Your GLX version is %d.%d,"

          "but TMU emulation needs at least 1.3. TMU disabled.\n",

          ver_major, ver_minor);

        XCloseDisplay(d);

        return NULL;

    }



    configs = glXChooseFBConfig(d, 0, glx_fbconfig_attr, &nelements);

    if (configs == NULL) {

        XCloseDisplay(d);

        return NULL;

    }



    XFree(configs);

    XCloseDisplay(d);



    dev = qdev_create(NULL, "milkymist-tmu2");

    qdev_init_nofail(dev);

    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, base);

    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq);



    return dev;

#else

    return NULL;

#endif

}



static inline DeviceState *milkymist_ac97_create(hwaddr base,

        qemu_irq crrequest_irq, qemu_irq crreply_irq, qemu_irq dmar_irq,

        qemu_irq dmaw_irq)

hw/lm32/milkymist.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include "hw/loader.h"

#include "elf.h"

#include "milkymist-hw.h"

#include "hw/display/milkymist_tmu2.h"

#include "lm32.h"

#include "exec/address-spaces.h"

include/hw/display/milkymist_tmu2.h

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/*

 *  QEMU model of the Milkymist texture mapping unit.

 *

 *  Copyright (c) 2010 Michael Walle <michael@walle.cc>

 *  Copyright (c) 2010 Sebastien Bourdeauducq

 *                       <sebastien.bourdeauducq@lekernel.net>

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation; either

 * version 2 of the License, or (at your option) any later version.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * Lesser General Public License for more details.

 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this library; if not, see <http://www.gnu.org/licenses/>.

 *

 *

 * Specification available at:

 *   http://milkymist.walle.cc/socdoc/tmu2.pdf

 *

 */



#ifndef HW_DISPLAY_MILKYMIST_TMU2_H

#define HW_DISPLAY_MILKYMIST_TMU2_H



#include "hw/qdev.h"



#if defined(CONFIG_X11) && defined(CONFIG_OPENGL)

DeviceState *milkymist_tmu2_create(hwaddr base, qemu_irq irq);

#else

static inline DeviceState *milkymist_tmu2_create(hwaddr base, qemu_irq irq)

{

    return NULL;

}

#endif



#endif /* HW_DISPLAY_MILKYMIST_TMU2_H */