ppc: move ADB stuff from ppc_mac.h to adb.h
Allow to use ADB in non-ppc macintosh Signed-off-by: Laurent Vivier <laurent@vivier.eu> Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
parent
11de8b7166
commit
7a880d9352
2
hw/adb.c
2
hw/adb.c
|
@ -22,7 +22,7 @@
|
||||||
* THE SOFTWARE.
|
* THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
#include "hw.h"
|
#include "hw.h"
|
||||||
#include "ppc_mac.h"
|
#include "adb.h"
|
||||||
#include "console.h"
|
#include "console.h"
|
||||||
|
|
||||||
/* debug ADB */
|
/* debug ADB */
|
||||||
|
|
|
@ -0,0 +1,67 @@
|
||||||
|
/*
|
||||||
|
* QEMU ADB emulation shared definitions and prototypes
|
||||||
|
*
|
||||||
|
* Copyright (c) 2004-2007 Fabrice Bellard
|
||||||
|
* Copyright (c) 2007 Jocelyn Mayer
|
||||||
|
*
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#if !defined(__ADB_H__)
|
||||||
|
#define __ADB_H__
|
||||||
|
|
||||||
|
#define MAX_ADB_DEVICES 16
|
||||||
|
|
||||||
|
#define ADB_MAX_OUT_LEN 16
|
||||||
|
|
||||||
|
typedef struct ADBDevice ADBDevice;
|
||||||
|
|
||||||
|
/* buf = NULL means polling */
|
||||||
|
typedef int ADBDeviceRequest(ADBDevice *d, uint8_t *buf_out,
|
||||||
|
const uint8_t *buf, int len);
|
||||||
|
typedef int ADBDeviceReset(ADBDevice *d);
|
||||||
|
|
||||||
|
struct ADBDevice {
|
||||||
|
struct ADBBusState *bus;
|
||||||
|
int devaddr;
|
||||||
|
int handler;
|
||||||
|
ADBDeviceRequest *devreq;
|
||||||
|
ADBDeviceReset *devreset;
|
||||||
|
void *opaque;
|
||||||
|
};
|
||||||
|
|
||||||
|
typedef struct ADBBusState {
|
||||||
|
ADBDevice devices[MAX_ADB_DEVICES];
|
||||||
|
int nb_devices;
|
||||||
|
int poll_index;
|
||||||
|
} ADBBusState;
|
||||||
|
|
||||||
|
int adb_request(ADBBusState *s, uint8_t *buf_out,
|
||||||
|
const uint8_t *buf, int len);
|
||||||
|
int adb_poll(ADBBusState *s, uint8_t *buf_out);
|
||||||
|
|
||||||
|
ADBDevice *adb_register_device(ADBBusState *s, int devaddr,
|
||||||
|
ADBDeviceRequest *devreq,
|
||||||
|
ADBDeviceReset *devreset,
|
||||||
|
void *opaque);
|
||||||
|
void adb_kbd_init(ADBBusState *bus);
|
||||||
|
void adb_mouse_init(ADBBusState *bus);
|
||||||
|
|
||||||
|
extern ADBBusState adb_bus;
|
||||||
|
#endif /* !defined(__ADB_H__) */
|
|
@ -24,6 +24,7 @@
|
||||||
*/
|
*/
|
||||||
#include "hw.h"
|
#include "hw.h"
|
||||||
#include "ppc_mac.h"
|
#include "ppc_mac.h"
|
||||||
|
#include "adb.h"
|
||||||
#include "qemu-timer.h"
|
#include "qemu-timer.h"
|
||||||
#include "sysemu.h"
|
#include "sysemu.h"
|
||||||
|
|
||||||
|
|
42
hw/ppc_mac.h
42
hw/ppc_mac.h
|
@ -77,46 +77,4 @@ void macio_nvram_setup_bar(MacIONVRAMState *s, MemoryRegion *bar,
|
||||||
void pmac_format_nvram_partition (MacIONVRAMState *nvr, int len);
|
void pmac_format_nvram_partition (MacIONVRAMState *nvr, int len);
|
||||||
uint32_t macio_nvram_read (void *opaque, uint32_t addr);
|
uint32_t macio_nvram_read (void *opaque, uint32_t addr);
|
||||||
void macio_nvram_write (void *opaque, uint32_t addr, uint32_t val);
|
void macio_nvram_write (void *opaque, uint32_t addr, uint32_t val);
|
||||||
|
|
||||||
/* adb.c */
|
|
||||||
|
|
||||||
#define MAX_ADB_DEVICES 16
|
|
||||||
|
|
||||||
#define ADB_MAX_OUT_LEN 16
|
|
||||||
|
|
||||||
typedef struct ADBDevice ADBDevice;
|
|
||||||
|
|
||||||
/* buf = NULL means polling */
|
|
||||||
typedef int ADBDeviceRequest(ADBDevice *d, uint8_t *buf_out,
|
|
||||||
const uint8_t *buf, int len);
|
|
||||||
typedef int ADBDeviceReset(ADBDevice *d);
|
|
||||||
|
|
||||||
struct ADBDevice {
|
|
||||||
struct ADBBusState *bus;
|
|
||||||
int devaddr;
|
|
||||||
int handler;
|
|
||||||
ADBDeviceRequest *devreq;
|
|
||||||
ADBDeviceReset *devreset;
|
|
||||||
void *opaque;
|
|
||||||
};
|
|
||||||
|
|
||||||
typedef struct ADBBusState {
|
|
||||||
ADBDevice devices[MAX_ADB_DEVICES];
|
|
||||||
int nb_devices;
|
|
||||||
int poll_index;
|
|
||||||
} ADBBusState;
|
|
||||||
|
|
||||||
int adb_request(ADBBusState *s, uint8_t *buf_out,
|
|
||||||
const uint8_t *buf, int len);
|
|
||||||
int adb_poll(ADBBusState *s, uint8_t *buf_out);
|
|
||||||
|
|
||||||
ADBDevice *adb_register_device(ADBBusState *s, int devaddr,
|
|
||||||
ADBDeviceRequest *devreq,
|
|
||||||
ADBDeviceReset *devreset,
|
|
||||||
void *opaque);
|
|
||||||
void adb_kbd_init(ADBBusState *bus);
|
|
||||||
void adb_mouse_init(ADBBusState *bus);
|
|
||||||
|
|
||||||
extern ADBBusState adb_bus;
|
|
||||||
|
|
||||||
#endif /* !defined(__PPC_MAC_H__) */
|
#endif /* !defined(__PPC_MAC_H__) */
|
||||||
|
|
|
@ -49,6 +49,7 @@
|
||||||
#include "hw.h"
|
#include "hw.h"
|
||||||
#include "ppc.h"
|
#include "ppc.h"
|
||||||
#include "ppc_mac.h"
|
#include "ppc_mac.h"
|
||||||
|
#include "adb.h"
|
||||||
#include "mac_dbdma.h"
|
#include "mac_dbdma.h"
|
||||||
#include "nvram.h"
|
#include "nvram.h"
|
||||||
#include "pc.h"
|
#include "pc.h"
|
||||||
|
|
|
@ -26,6 +26,7 @@
|
||||||
#include "hw.h"
|
#include "hw.h"
|
||||||
#include "ppc.h"
|
#include "ppc.h"
|
||||||
#include "ppc_mac.h"
|
#include "ppc_mac.h"
|
||||||
|
#include "adb.h"
|
||||||
#include "mac_dbdma.h"
|
#include "mac_dbdma.h"
|
||||||
#include "nvram.h"
|
#include "nvram.h"
|
||||||
#include "pc.h"
|
#include "pc.h"
|
||||||
|
|
Loading…
Reference in New Issue