Ignore:
Timestamp:
Feb 12, 2013, 6:33:31 PM (11 years ago)
Author:
meunier
Message:

Added support for memspaces and const.
Added an interrupt masking to the "giet_context_switch" syscall
Corrected two bugs in boot/boot_init.c (one minor and one regarding barriers initialization)
Reformatted the code in all files.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • soft/giet_vm/sys/drivers.h

    r218 r228  
    1616extern volatile unsigned char _timer_event[];
    1717
    18 unsigned int _timer_start( unsigned int cluster_id,
    19                            unsigned int local_id,
    20                            unsigned int period );
     18unsigned int _timer_start(unsigned int cluster_id, unsigned int local_id, unsigned int period);
     19unsigned int _timer_stop(unsigned int cluster_id, unsigned int local_id);
     20unsigned int _timer_reset_irq(unsigned int cluster_id, unsigned int local_id);
     21unsigned int _timer_reset_irq_cpt(unsigned int cluster_id, unsigned int local_id);
    2122
    22 unsigned int _timer_stop(  unsigned int cluster_id,
    23                            unsigned int local_id );
    24 
    25 
    26 unsigned int _timer_reset_irq( unsigned int     cluster_id,
    27                                unsigned int local_id );
    2823
    2924///////////////////////////////////////////////////////////////////////////////////
    … …  
    3328extern volatile unsigned char _tty_get_buf[];
    3429extern volatile unsigned char _tty_get_full[];
    35 extern unsigned int           _tty_put_lock;
     30extern unsigned int _tty_put_lock;
    3631
    37 unsigned int _tty_write(    const char*         buffer,
    38                             unsigned int        length);
    39 
    40 unsigned int _tty_read(     char*                       buffer,
    41                             unsigned int        length);
    42 
    43 unsigned int _tty_get_char( unsigned int        tty_id,
    44                             unsigned char*      buffer);
     32unsigned int _tty_write(const char * buffer, unsigned int length);
     33unsigned int _tty_read(char * buffer, unsigned int length);
     34unsigned int _tty_get_char(unsigned int tty_id, unsigned char * buffer);
    4535
    4636///////////////////////////////////////////////////////////////////////////////////
    … …  
    4838///////////////////////////////////////////////////////////////////////////////////
    4939
    50 unsigned int _icu_get_index(unsigned int        cluster_id,
    51                             unsigned int        proc_id,
    52                             unsigned int*       buffer );
    53 
    54 unsigned int _icu_set_mask( unsigned int        cluster_id,
    55                                                         unsigned int    proc_id,
    56                                                         unsigned int    mask,
    57                                                         unsigned int    is_timer );
     40unsigned int _icu_get_index(unsigned int cluster_id, unsigned int proc_id, unsigned int * buffer);
     41unsigned int _icu_set_mask(
     42        unsigned int cluster_id,
     43        unsigned int proc_id,
     44        unsigned int mask,
     45        unsigned int is_timer);
    5846
    5947///////////////////////////////////////////////////////////////////////////////////
    … …  
    6149///////////////////////////////////////////////////////////////////////////////////
    6250
    63 extern volatile unsigned int    _ioc_status;
    64 extern volatile unsigned int    _ioc_done;
    65 extern unsigned int                             _ioc_lock;
    66 extern unsigned int                             _ioc_iommu_ix1;
    67 extern unsigned int                             _ioc_iommu_npages;
     51extern volatile unsigned int _ioc_status;
     52extern volatile unsigned int _ioc_done;
     53extern unsigned int _ioc_lock;
     54extern unsigned int _ioc_iommu_ix1;
     55extern unsigned int _ioc_iommu_npages;
    6856
    6957
    70 unsigned int _ioc_write(    unsigned int        lba,
    71                             const void*         buffer,
    72                             unsigned int        count);
    73 
    74 unsigned int _ioc_read(     unsigned int        lba,
    75                             void*                       buffer,
    76                             unsigned int        count);
    77 
     58unsigned int _ioc_write(unsigned int lba, const void * buffer, unsigned int count);
     59unsigned int _ioc_read(unsigned int lba, void * buffer, unsigned int count);
    7860unsigned int _ioc_completed();
    79 
    80 unsigned int _ioc_get_status( unsigned int* status);
     61unsigned int _ioc_get_status(unsigned int * status);
    8162
    8263///////////////////////////////////////////////////////////////////////////////////
    83 // Multi DMA variables                  (vci_multi_dma)
     64// Multi DMA variables            (vci_multi_dma)
    8465///////////////////////////////////////////////////////////////////////////////////
    85  
    86 extern volatile unsigned int    _dma_status[];
    87 extern volatile unsigned int    _dma_done[];
    88 extern unsigned int                             _dma_lock[];
    89 extern unsigned int                             _dma_iommu_ix1;
    90 extern unsigned int                             _dma_iommu_npages[];
    9166
    92 unsigned int _dma_reset_irq( unsigned int       cluster_id,
    93                              unsigned int       local_id );
     67extern volatile unsigned int _dma_status[];
     68extern volatile unsigned int _dma_done[];
     69extern unsigned int _dma_lock[];
     70extern unsigned int _dma_iommu_ix1;
     71extern unsigned int _dma_iommu_npages[];
    9472
    95 unsigned int _dma_get_status( unsigned int      cluster_id,
    96                               unsigned int      local_id,
    97                               unsigned int*     status );
     73unsigned int _dma_reset_irq(unsigned int cluster_id, unsigned int local_id);
     74unsigned int _dma_get_status(unsigned int cluster_id, unsigned int local_id, unsigned int * status);
    9875
    99 unsigned int _dma_transfer(   unsigned int  dev_type,
    100                               unsigned int  to_user,
    101                               unsigned int  offset,
    102                               unsigned int  user_vaddr,
    103                               unsigned int  length );
     76unsigned int _dma_transfer(
     77        unsigned int dev_type,
     78        unsigned int to_user,
     79        unsigned int offset,
     80        unsigned int user_vaddr,
     81        unsigned int length);
    10482
    10583unsigned int _dma_completed();
    … …  
    10886// Frame Buffer access functions  (vci_frame_buffer)
    10987///////////////////////////////////////////////////////////////////////////////////
    110  
    111 unsigned int _fb_sync_write(unsigned int        offset,
    112                             const void*         buffer,
    113                             unsigned int        length);
    11488
    115 unsigned int _fb_sync_read( unsigned int        offset,
    116                             const void*         buffer,
    117                             unsigned int        length);
    118 
    119 unsigned int _fb_write(     unsigned int        offset,
    120                             const void*         buffer,
    121                             unsigned int        length);
    122 
    123 unsigned int _fb_read(      unsigned int        offset,
    124                             const void*         buffer,
    125                             unsigned int        length);
     89unsigned int _fb_sync_write(unsigned int offset, const void * buffer, unsigned int length);
     90unsigned int _fb_sync_read( unsigned int offset, const void * buffer, unsigned int length);
     91unsigned int _fb_write(     unsigned int offset, const void * buffer, unsigned int length);
     92unsigned int _fb_read(      unsigned int offset, const void * buffer, unsigned int length);
    12693
    12794unsigned int _fb_completed();
    … …  
    13198///////////////////////////////////////////////////////////////////////////////////
    13299
    133 unsigned int _nic_sync_write(unsigned int       offset,
    134                             const void*         buffer,
    135                             unsigned int        length);
    136 
    137 unsigned int _nic_sync_read( unsigned int       offset,
    138                             const void*         buffer,
    139                             unsigned int        length);
    140 
    141 
    142 unsigned int _nic_write(    unsigned int        offset,
    143                                         const void*             buffer,
    144                                         unsigned int    length);
    145 
    146 unsigned int _nic_read(     unsigned int        offset,
    147                                         const void*             buffer,
    148                                         unsigned int    length);
     100unsigned int _nic_sync_write(unsigned int offset, const void * buffer, unsigned int length);
     101unsigned int _nic_sync_read( unsigned int offset, const void * buffer, unsigned int length);
     102unsigned int _nic_write(     unsigned int offset, const void * buffer, unsigned int length);
     103unsigned int _nic_read(      unsigned int offset, const void * buffer, unsigned int length);
    149104
    150105unsigned int _nic_completed();
    … …  
    154109///////////////////////////////////////////////////////////////////////////////////
    155110
    156 unsigned int _gcd_write(    unsigned int        register_index,
    157                             unsigned int        value);
    158 
    159 unsigned int _gcd_read(     unsigned int        register_index,
    160                             unsigned int*       buffer);
     111unsigned int _gcd_write(unsigned int register_index, unsigned int   value);
     112unsigned int _gcd_read( unsigned int register_index, unsigned int * buffer);
    161113
    162114
    163115#endif
    164116
     117// Local Variables:
     118// tab-width: 4
     119// c-basic-offset: 4
     120// c-file-offsets:((innamespace . 0)(inline-open . 0))
     121// indent-tabs-mode: nil
     122// End:
     123// vim: filetype=c:expandtab:shiftwidth=4:tabstop=4:softtabstop=4
     124
Note: See TracChangeset for help on using the changeset viewer.