Changeset 2a37b9f in mainline for uspace/drv/platform/leon3/leon3.c


Ignore:
Timestamp:
2014-08-28T19:54:48Z (10 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0f2a9be
Parents:
0ddb84b
Message:

Reorganize platform drivers.

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/drv/platform/leon3/leon3.c

    r0ddb84b r2a37b9f  
    4040#include <ops/hw_res.h>
    4141#include <stdio.h>
    42 #include "rootleon3.h"
     42#include "leon3.h"
    4343
    44 #define NAME  "rootleon3"
     44#define NAME  "leon3"
    4545
    4646typedef struct {
     
    4848        match_id_t match_id;
    4949        hw_resource_list_t hw_resources;
    50 } rootleon3_fun_t;
     50} leon3_fun_t;
    5151
    5252static hw_resource_t amba_res[] = {
     
    6969};
    7070
    71 static const rootleon3_fun_t leon3_func = {
     71static const leon3_fun_t leon3_func = {
    7272        .name = "leon_amba",
    7373        .match_id = {
     
    8181};
    8282
    83 static hw_resource_list_t *rootleon3_get_resources(ddf_fun_t *);
    84 static bool rootleon3_enable_interrupt(ddf_fun_t *);
     83static hw_resource_list_t *leon3_get_resources(ddf_fun_t *);
     84static bool leon3_enable_interrupt(ddf_fun_t *);
    8585
    8686static hw_res_ops_t fun_hw_res_ops = {
    87         .get_resource_list = &rootleon3_get_resources,
    88         .enable_interrupt = &rootleon3_enable_interrupt
     87        .get_resource_list = &leon3_get_resources,
     88        .enable_interrupt = &leon3_enable_interrupt
    8989};
    9090
    91 static ddf_dev_ops_t rootleon3_fun_ops = {
     91static ddf_dev_ops_t leon3_fun_ops = {
    9292        .interfaces[HW_RES_DEV_IFACE] = &fun_hw_res_ops
    9393};
    9494
    95 static int rootleon3_add_fun(ddf_dev_t *dev, const rootleon3_fun_t *fun)
     95static int leon3_add_fun(ddf_dev_t *dev, const leon3_fun_t *fun)
    9696{
    9797        assert(dev);
     
    114114       
    115115        /* Allocate needed data */
    116         rootleon3_fun_t *rf =
    117             ddf_fun_data_alloc(fnode, sizeof(rootleon3_fun_t));
     116        leon3_fun_t *rf =
     117            ddf_fun_data_alloc(fnode, sizeof(leon3_fun_t));
    118118        if (!rf) {
    119119                ddf_fun_destroy(fnode);
     
    123123       
    124124        /* Set provided operations to the device. */
    125         ddf_fun_set_ops(fnode, &rootleon3_fun_ops);
     125        ddf_fun_set_ops(fnode, &leon3_fun_ops);
    126126       
    127127        /* Register function. */
     
    144144 *
    145145 */
    146 static int rootleon3_dev_add(ddf_dev_t *dev)
     146static int leon3_dev_add(ddf_dev_t *dev)
    147147{
    148148        assert(dev);
    149149       
    150150        /* Register functions */
    151         if (rootleon3_add_fun(dev, &leon3_func) != EOK) {
     151        if (leon3_add_fun(dev, &leon3_func) != EOK) {
    152152                ddf_msg(LVL_ERROR, "Failed to add %s function for "
    153153                    "LEON3 platform.", leon3_func.name);
     
    158158
    159159/** The root device driver's standard operations. */
    160 static driver_ops_t rootleon3_ops = {
    161         .dev_add = &rootleon3_dev_add
     160static driver_ops_t leon3_ops = {
     161        .dev_add = &leon3_dev_add
    162162};
    163163
    164164/** The root device driver structure. */
    165 static driver_t rootleon3_driver = {
     165static driver_t leon3_driver = {
    166166        .name = NAME,
    167         .driver_ops = &rootleon3_ops
     167        .driver_ops = &leon3_ops
    168168};
    169169
    170 static hw_resource_list_t *rootleon3_get_resources(ddf_fun_t *fnode)
     170static hw_resource_list_t *leon3_get_resources(ddf_fun_t *fnode)
    171171{
    172         rootleon3_fun_t *fun = ddf_fun_data_get(fnode);
     172        leon3_fun_t *fun = ddf_fun_data_get(fnode);
    173173        assert(fun != NULL);
    174174       
    175         printf("rootleon3_get_resources() called\n");
     175        printf("leon3_get_resources() called\n");
    176176       
    177177        return &fun->hw_resources;
    178178}
    179179
    180 static bool rootleon3_enable_interrupt(ddf_fun_t *fun)
     180static bool leon3_enable_interrupt(ddf_fun_t *fun)
    181181{
    182182        // FIXME TODO
     
    188188        printf("%s: HelenOS SPARC LEON3 platform driver\n", NAME);
    189189        ddf_log_init(NAME);
    190         return ddf_driver_main(&rootleon3_driver);
     190        return ddf_driver_main(&leon3_driver);
    191191}
    192192
Note: See TracChangeset for help on using the changeset viewer.