Ignore:
Timestamp:
2011-09-19T16:31:00Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a347a11
Parents:
3842a955 (diff), 086290d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

File:
1 moved

Legend:

Unmodified
Added
Removed
  • kernel/arch/mips64/include/debugger.h

    r3842a955 r26e7d6d  
    11/*
    2  * Copyright (c) 2011 Jan Vesely
     2 * Copyright (c) 2005 Ondrej Palkovsky
    33 * All rights reserved.
    44 *
     
    2626 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    2727 */
    28 /** @addtogroup drvusbohci
     28
     29/** @addtogroup mips64
    2930 * @{
    3031 */
    3132/** @file
    32  * @brief OHCI driver USB transaction structure
    3333 */
    34 #ifndef DRV_OHCI_BATCH_H
    35 #define DRV_OHCI_BATCH_H
    3634
    37 #include <usbhc_iface.h>
    38 #include <usb/usb.h>
    39 #include <usb/host/device_keeper.h>
    40 #include <usb/host/endpoint.h>
    41 #include <usb/host/batch.h>
     35#ifndef KERN_mips64_DEBUGGER_H_
     36#define KERN_mips64_DEBUGGER_H_
    4237
    43 usb_transfer_batch_t * batch_get(
    44     ddf_fun_t *fun, endpoint_t *ep, char *buffer, size_t size,
    45     const char *setup_buffer, size_t setup_size,
    46     usbhc_iface_transfer_in_callback_t func_in,
    47     usbhc_iface_transfer_out_callback_t func_out,
    48     void *arg);
     38#include <arch/exception.h>
     39#include <typedefs.h>
    4940
    50 bool batch_is_complete(usb_transfer_batch_t *instance);
     41#define BKPOINTS_MAX  10
    5142
    52 void batch_commit(usb_transfer_batch_t *instance);
     43/** Breakpoint was shot */
     44#define BKPOINT_INPROG  (1 << 0)
    5345
    54 void batch_control_write(usb_transfer_batch_t *instance);
     46/** One-time breakpoint, mandatory for j/b instructions */
     47#define BKPOINT_ONESHOT  (1 << 1)
    5548
    56 void batch_control_read(usb_transfer_batch_t *instance);
     49/**
     50 * Breakpoint is set on the next instruction, so that it
     51 * could be reinstalled on the previous one
     52 */
     53#define BKPOINT_REINST  (1 << 2)
    5754
    58 void batch_interrupt_in(usb_transfer_batch_t *instance);
     55/** Call a predefined function */
     56#define BKPOINT_FUNCCALL  (1 << 3)
    5957
    60 void batch_interrupt_out(usb_transfer_batch_t *instance);
    6158
    62 void batch_bulk_in(usb_transfer_batch_t *instance);
     59typedef struct  {
     60        uintptr_t address;         /**< Breakpoint address */
     61        sysarg_t instruction;      /**< Original instruction */
     62        sysarg_t nextinstruction;  /**< Original instruction following break */
     63        unsigned int flags;        /**< Flags regarding breakpoint */
     64        size_t counter;
     65        void (*bkfunc)(void *, istate_t *);
     66} bpinfo_t;
    6367
    64 void batch_bulk_out(usb_transfer_batch_t *instance);
     68extern bpinfo_t breakpoints[BKPOINTS_MAX];
     69
     70extern bool is_jump(sysarg_t);
     71
     72extern void debugger_init(void);
     73extern void debugger_bpoint(istate_t *);
     74
    6575#endif
    66 /**
    67  * @}
     76
     77/** @}
    6878 */
Note: See TracChangeset for help on using the changeset viewer.