Changeset 97c7682 in mainline for uspace/srv/bd/ata_bd/ata_bd.c


Ignore:
Timestamp:
2012-07-14T11:18:40Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
804d9b6
Parents:
0747468 (diff), f0348c8 (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.

Text conflict in boot/arch/arm32/Makefile.inc:

Trivial conflict around ifeq condition.

Text conflict in kernel/arch/arm32/include/mm/page.h:

Added defines and set_pt_levelx_present function.
COnflict looked horrible because of the armv4/v7 split.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/bd/ata_bd/ata_bd.c

    r0747468 r97c7682  
    191191        }
    192192
    193         printf(NAME ": Accepting connections\n");
     193        printf("%s: Accepting connections\n", NAME);
    194194        task_retval(0);
    195195        async_manager();
     
    243243static int ata_bd_init(void)
    244244{
     245        async_set_client_connection(ata_bd_connection);
     246        int rc = loc_server_register(NAME);
     247        if (rc != EOK) {
     248                printf("%s: Unable to register driver.\n", NAME);
     249                return rc;
     250        }
     251       
    245252        void *vaddr;
    246         int rc;
    247        
    248         async_set_client_connection(ata_bd_connection);
    249         rc = loc_server_register(NAME);
    250         if (rc < 0) {
    251                 printf(NAME ": Unable to register driver.\n");
    252                 return rc;
    253         }
    254 
    255253        rc = pio_enable((void *) cmd_physical, sizeof(ata_cmd_t), &vaddr);
    256254        if (rc != EOK) {
    257                 printf(NAME ": Could not initialize device I/O space.\n");
     255                printf("%s: Could not initialize device I/O space.\n", NAME);
    258256                return rc;
    259257        }
    260 
     258       
    261259        cmd = vaddr;
    262 
     260       
    263261        rc = pio_enable((void *) ctl_physical, sizeof(ata_ctl_t), &vaddr);
    264262        if (rc != EOK) {
    265                 printf(NAME ": Could not initialize device I/O space.\n");
     263                printf("%s: Could not initialize device I/O space.\n", NAME);
    266264                return rc;
    267265        }
    268 
     266       
    269267        ctl = vaddr;
    270 
    271 
     268       
    272269        return EOK;
    273270}
     
    311308
    312309        (void) async_share_out_finalize(callid, &fs_va);
    313         if (fs_va == (void *) -1) {
     310        if (fs_va == AS_MAP_FAILED) {
    314311                async_answer_0(callid, EHANGUP);
    315312                return;
Note: See TracChangeset for help on using the changeset viewer.