Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.c =================================================================== --- uspace/srv/hw/bus/cuda_adb/cuda_adb.c (revision 91b604993517a2bdc14cfe1ede6902150ab29533) +++ uspace/srv/hw/bus/cuda_adb/cuda_adb.c (revision 68867058869369685d981262cbba547ba0b5e8d3) @@ -50,4 +50,5 @@ #include #include "cuda_adb.h" +#include "cuda_hw.h" #define NAME "cuda_adb" @@ -68,41 +69,4 @@ static void adb_packet_handle(uint8_t *data, size_t size, bool autopoll); - - -/** B register fields */ -enum { - TREQ = 0x08, - TACK = 0x10, - TIP = 0x20 -}; - -/** IER register fields */ -enum { - IER_CLR = 0x00, - IER_SET = 0x80, - - SR_INT = 0x04, - ALL_INT = 0x7f -}; - -/** ACR register fields */ -enum { - SR_OUT = 0x10 -}; - -/** Packet types */ -enum { - PT_ADB = 0x00, - PT_CUDA = 0x01 -}; - -/** CUDA packet types */ -enum { - CPT_AUTOPOLL = 0x01 -}; - -enum { - ADB_MAX_ADDR = 16 -}; static irq_pio_range_t cuda_ranges[] = { @@ -172,5 +136,5 @@ rc = loc_service_register("adb/kbd", &service_id); if (rc != EOK) { - printf(NAME ": Unable to register service %s.\n", "adb/kdb"); + printf(NAME ": Unable to register service %s.\n", "adb/kbd"); return rc; } @@ -181,5 +145,5 @@ rc = loc_service_register("adb/mouse", &service_id); if (rc != EOK) { - printf(NAME ": Unable to register servise %s.\n", "adb/mouse"); + printf(NAME ": Unable to register service %s.\n", "adb/mouse"); return rc; } Index: uspace/srv/hw/bus/cuda_adb/cuda_adb.h =================================================================== --- uspace/srv/hw/bus/cuda_adb/cuda_adb.h (revision 91b604993517a2bdc14cfe1ede6902150ab29533) +++ uspace/srv/hw/bus/cuda_adb/cuda_adb.h (revision 68867058869369685d981262cbba547ba0b5e8d3) @@ -37,58 +37,8 @@ #define CUDA_ADB_H_ +#include +#include #include #include -#include -#include - -typedef struct { - uint8_t b; - uint8_t pad0[0x1ff]; - - uint8_t a; - uint8_t pad1[0x1ff]; - - uint8_t dirb; - uint8_t pad2[0x1ff]; - - uint8_t dira; - uint8_t pad3[0x1ff]; - - uint8_t t1cl; - uint8_t pad4[0x1ff]; - - uint8_t t1ch; - uint8_t pad5[0x1ff]; - - uint8_t t1ll; - uint8_t pad6[0x1ff]; - - uint8_t t1lh; - uint8_t pad7[0x1ff]; - - uint8_t t2cl; - uint8_t pad8[0x1ff]; - - uint8_t t2ch; - uint8_t pad9[0x1ff]; - - uint8_t sr; - uint8_t pad10[0x1ff]; - - uint8_t acr; - uint8_t pad11[0x1ff]; - - uint8_t pcr; - uint8_t pad12[0x1ff]; - - uint8_t ifr; - uint8_t pad13[0x1ff]; - - uint8_t ier; - uint8_t pad14[0x1ff]; - - uint8_t anh; - uint8_t pad15[0x1ff]; -} cuda_t; enum { @@ -110,5 +60,5 @@ typedef struct { - cuda_t *cuda; + struct cuda *cuda; uintptr_t cuda_physical; Index: uspace/srv/hw/bus/cuda_adb/cuda_hw.h =================================================================== --- uspace/srv/hw/bus/cuda_adb/cuda_hw.h (revision 68867058869369685d981262cbba547ba0b5e8d3) +++ uspace/srv/hw/bus/cuda_adb/cuda_hw.h (revision 68867058869369685d981262cbba547ba0b5e8d3) @@ -0,0 +1,130 @@ +/* + * Copyright (c) 2006 Martin Decky + * Copyright (c) 2010 Jiri Svoboda + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup genarch + * @{ + */ +/** @file + */ + +#ifndef CUDA_HW_H_ +#define CUDA_HW_H_ + +#include + +typedef struct cuda { + uint8_t b; + uint8_t pad0[0x1ff]; + + uint8_t a; + uint8_t pad1[0x1ff]; + + uint8_t dirb; + uint8_t pad2[0x1ff]; + + uint8_t dira; + uint8_t pad3[0x1ff]; + + uint8_t t1cl; + uint8_t pad4[0x1ff]; + + uint8_t t1ch; + uint8_t pad5[0x1ff]; + + uint8_t t1ll; + uint8_t pad6[0x1ff]; + + uint8_t t1lh; + uint8_t pad7[0x1ff]; + + uint8_t t2cl; + uint8_t pad8[0x1ff]; + + uint8_t t2ch; + uint8_t pad9[0x1ff]; + + uint8_t sr; + uint8_t pad10[0x1ff]; + + uint8_t acr; + uint8_t pad11[0x1ff]; + + uint8_t pcr; + uint8_t pad12[0x1ff]; + + uint8_t ifr; + uint8_t pad13[0x1ff]; + + uint8_t ier; + uint8_t pad14[0x1ff]; + + uint8_t anh; + uint8_t pad15[0x1ff]; +} cuda_t; + +/** B register fields */ +enum { + TREQ = 0x08, + TACK = 0x10, + TIP = 0x20 +}; + +/** IER register fields */ +enum { + IER_CLR = 0x00, + IER_SET = 0x80, + + SR_INT = 0x04, + ALL_INT = 0x7f +}; + +/** ACR register fields */ +enum { + SR_OUT = 0x10 +}; + +/** Packet types */ +enum { + PT_ADB = 0x00, + PT_CUDA = 0x01 +}; + +/** CUDA packet types */ +enum { + CPT_AUTOPOLL = 0x01 +}; + +enum { + ADB_MAX_ADDR = 16 +}; + +#endif + +/** @} + */