qemu-char: move baum registration to baum.c (08744c98) · Commits · SUMMER2020 / students / proj-2021291

hw/baum.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -562,7 +562,7 @@ static void baum_close(struct CharDriverState *chr)
		g_free(baum);
		}

		CharDriverState chr_baum_init(QemuOpts opts)
		static CharDriverState chr_baum_init(QemuOpts opts)
		{
		BaumDriverState *baum;
		CharDriverState *chr;
		@@ -625,3 +625,10 @@ fail_handle:
		g_free(baum);
		return NULL;
		}

		static void register_types(void)
		{
		register_char_driver("braille", chr_baum_init);
		}

		type_init(register_types);

deleted100644 → 0

+0 −30

Original line number	Diff line number	Diff line
		/*
		* QEMU Baum
		*
		* Copyright (c) 2008 Samuel Thibault
		*
		* Permission is hereby granted, free of charge, to any person obtaining a copy
		* of this software and associated documentation files (the "Software"), to deal
		* in the Software without restriction, including without limitation the rights
		* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
		* copies of the Software, and to permit persons to whom the Software is
		* furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice shall be included in
		* all copies or substantial portions 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 NONINFRINGEMENT. IN NO EVENT SHALL
		* THE AUTHORS OR COPYRIGHT HOLDERS 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.
		*/
		#ifndef HW_BAUM_H
		#define HW_BAUM_H 1

		/* char device */
		CharDriverState chr_baum_init(QemuOpts opts);

		#endif

+0 −4

Original line number	Diff line number	Diff line
		@@ -28,7 +28,6 @@
		#include "qemu/timer.h"
		#include "char/char.h"
		#include "hw/usb.h"
		#include "hw/baum.h"
		#include "hw/msmouse.h"
		#include "qmp-commands.h"

		@@ -3678,9 +3677,6 @@ static void register_types(void)
		register_char_driver("pipe", qemu_chr_open_pipe);
		register_char_driver("stdio", qemu_chr_open_stdio);
		#endif
		#ifdef CONFIG_BRLAPI
		register_char_driver("braille", chr_baum_init);
		#endif
		#ifdef HAVE_CHARDEV_TTY
		register_char_driver("tty", qemu_chr_open_tty);
		register_char_driver("serial", qemu_chr_open_tty);

+0 −1