Changeset 8565a42 in mainline for uspace/srv/bd/sata_bd/sata_bd.c
- Timestamp:
- 2018-03-02T20:34:50Z (7 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- a1a81f69, d5e5fd1
- Parents:
- 3061bc1 (diff), 34e1206 (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. - git-author:
- Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)
- git-committer:
- GitHub <noreply@…> (2018-03-02 20:34:50)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/bd/sata_bd/sata_bd.c
r3061bc1 r8565a42 94 94 size_t count, i; 95 95 errno_t rc; 96 96 97 97 /* If device is SATA, add device to the disk array. */ 98 98 disk[disk_count].sess = ahci_get_sess(funh, &disk[disk_count].dev_name); 99 99 if(disk[disk_count].sess != NULL) { 100 100 101 101 ahci_get_sata_device_name(disk[disk_count].sess, 102 102 SATA_DEV_NAME_LENGTH, disk[disk_count].sata_dev_name); 103 103 104 104 ahci_get_block_size(disk[disk_count].sess, 105 105 &disk[disk_count].block_size); 106 106 107 107 ahci_get_num_blocks(disk[disk_count].sess, &disk[disk_count].blocks); 108 108 109 109 bd_srvs_init(&disk[disk_count].bds); 110 110 disk[disk_count].bds.ops = &sata_bd_ops; 111 111 disk[disk_count].bds.sarg = &disk[disk_count]; 112 112 113 113 printf("Device %s - %s , blocks: %lu, block_size: %lu\n", 114 114 disk[disk_count].dev_name, disk[disk_count].sata_dev_name, … … 118 118 ++disk_count; 119 119 } 120 120 121 121 /* search children */ 122 122 rc = devman_fun_get_child(funh, &devh); … … 152 152 devman_handle_t root_fun; 153 153 errno_t rc; 154 154 155 155 disk_count = 0; 156 156 … … 160 160 return EIO; 161 161 } 162 162 163 163 scan_device_tree(root_fun); 164 164 165 165 return EOK; 166 166 } … … 248 248 errno_t rc; 249 249 category_id_t disk_cat; 250 250 251 251 async_set_fallback_port_handler(sata_bd_connection, NULL); 252 252 rc = loc_server_register(NAME); … … 255 255 return rc; 256 256 } 257 257 258 258 rc = get_sata_disks(); 259 259 if (rc != EOK) {
Note:
See TracChangeset
for help on using the changeset viewer.