Changeset 2b95d13 in mainline for kernel/genarch/include


Ignore:
Timestamp:
2013-03-12T21:07:15Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
606f6a1
Parents:
976c434 (diff), eceff5f (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.

Location:
kernel/genarch/include/genarch
Files:
13 added
43 moved

Legend:

Unmodified
Added
Removed

  • kernel/genarch/include/genarch/drivers/amdm37x/uart_regs.h

    r976c434 r2b95d13  
    3131/**
    3232 * @file
    33  * @brief Texas Instruments AMDM37x on-chip interrupt controller driver.
     33 * @brief Texas Instruments AMDM37x UART memory mapped registers.
    3434 */
    3535
    … …  
    4040#include <console/chardev.h>
    4141#include <ddi/irq.h>
    42 
    43 /* AMDM37x TRM p. 2950 */
    44 #define AMDM37x_UART1_BASE_ADDRESS   0x4806a000
    45 #define AMDM37x_UART1_SIZE   1024
    46 #define AMDM37x_UART1_IRQ   72 /* AMDM37x TRM p. 2418 */
    47 
    48 #define AMDM37x_UART2_BASE_ADDRESS   0x4806b000
    49 #define AMDM37x_UART2_SIZE   1024
    50 #define AMDM37x_UART2_IRQ   73 /* AMDM37x TRM p. 2418 */
    51 
    52 #define AMDM37x_UART3_BASE_ADDRESS   0x49020000
    53 #define AMDM37x_UART3_SIZE   1024
    54 #define AMDM37x_UART3_IRQ   74 /* AMDM37x TRM p. 2418 */
    55 
    56 #define AMDM37x_UART4_BASE_ADDRESS   0x49042000
    57 #define AMDM37x_UART4_SIZE   1024
    58 #define AMDM37x_UART4_IRQ   80 /* AMDM37x TRM p. 2418 */
    5942
    6043typedef struct {
    … …  
    343326
    344327                /** BOF control register (IrDA only) */
    345                 ioport32_t blr; /* UART3 sepcific */
     328                ioport32_t blr; /* UART3 specific */
    346329#define AMDM37x_IRDA_BLR_XBOF_TYPE_FLAG   (1 << 6)
    347330#define AMDM37x_IRDA_BLR_STS_FIFO_RESET   (1 << 7)
    … …  
    442425} amdm37x_uart_regs_t;
    443426
    444 typedef struct {
    445         amdm37x_uart_regs_t *regs;
    446         indev_t *indev;
    447         outdev_t outdev;
    448         irq_t irq;
    449 } amdm37x_uart_t;
    450 
    451 
    452 bool amdm37x_uart_init(amdm37x_uart_t *, inr_t, uintptr_t, size_t);
    453 void amdm37x_uart_input_wire(amdm37x_uart_t *, indev_t *);
    454 
    455427#endif
    456428
Note: See TracChangeset for help on using the changeset viewer.