Changeset b8e72fd1 in mainline for uspace/drv/block/ahci/ahci.c

Timestamp:

2013-05-30T17:13:02Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

98abd40

Parents:

be2bb4f (diff), 94dfb92 (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

File:

• uspace/drv/block/ahci/ahci.c (modified) (7 diffs)

uspace/drv/block/ahci/ahci.c

@@ -242 +242 @@
         }
         
-        bzero(buf, sata->block_size);
+        memset(buf, 0, sata->block_size);
         
         fibril_mutex_lock(&sata->lock);
@@ -444 +444 @@
         }
         
-        bzero(idata, SATA_IDENTIFY_DEVICE_BUFFER_LENGTH);
+        memset(idata, 0, SATA_IDENTIFY_DEVICE_BUFFER_LENGTH);
         
         fibril_mutex_lock(&sata->lock);
@@ -637 +637 @@
         }
         
-        bzero(idata, SATA_SET_FEATURE_BUFFER_LENGTH);
+        memset(idata, 0, SATA_SET_FEATURE_BUFFER_LENGTH);
         
         fibril_mutex_lock(&sata->lock);
@@ -954 +954 @@
                 goto error_retfis;
         
-        bzero(virt_fb, size);
+        memset(virt_fb, 0, size);
         sata->port->pxfbu = HI(phys);
         sata->port->pxfb = LO(phys);
@@ -964 +964 @@
                 goto error_cmd;
         
-        bzero(virt_cmd, size);
+        memset(virt_cmd, 0, size);
         sata->port->pxclbu = HI(phys);
         sata->port->pxclb = LO(phys);
@@ -975 +975 @@
                 goto error_table;
         
-        bzero(virt_table, size);
+        memset(virt_table, 0, size);
         sata->cmd_header->cmdtableu = HI(phys);
         sata->cmd_header->cmdtable = LO(phys);
@@ -1287 +1287 @@
 {
         uint8_t model[40];
-        bzero(model, 40);
+        memset(model, 0, 40);
         
         for (unsigned int i = 0; i < 20; i++) {