[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2345] 2009-06-19 Vladimir Serbinenko <address@hidden>
From: |
Vladimir Serbinenko |
Subject: |
[2345] 2009-06-19 Vladimir Serbinenko <address@hidden> |
Date: |
Fri, 19 Jun 2009 17:38:28 +0000 |
Revision: 2345
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2345
Author: phcoder
Date: 2009-06-19 17:38:27 +0000 (Fri, 19 Jun 2009)
Log Message:
-----------
2009-06-19 Vladimir Serbinenko <address@hidden>
* disk/scsi.c (grub_scsi_open): use continue instead of big if
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/disk/scsi.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-06-18 20:00:34 UTC (rev 2344)
+++ trunk/grub2/ChangeLog 2009-06-19 17:38:27 UTC (rev 2345)
@@ -1,3 +1,7 @@
+2009-06-19 Vladimir Serbinenko <address@hidden>
+
+ * disk/scsi.c (grub_scsi_open): use continue instead of big if
+
2009-06-18 Pavel Roskin <address@hidden>
* conf/common.rmk: Add fs_file.mod.
Modified: trunk/grub2/disk/scsi.c
===================================================================
--- trunk/grub2/disk/scsi.c 2009-06-18 20:00:34 UTC (rev 2344)
+++ trunk/grub2/disk/scsi.c 2009-06-19 17:38:27 UTC (rev 2345)
@@ -246,66 +246,65 @@
for (p = grub_scsi_dev_list; p; p = p->next)
{
- if (! p->open (name, scsi))
+ if (p->open (name, scsi))
+ continue;
+ disk->id = (unsigned long) "scsi"; /* XXX */
+ disk->data = scsi;
+ scsi->dev = p;
+ scsi->lun = lun;
+ scsi->name = grub_strdup (name);
+ if (! scsi->name)
{
- disk->id = (unsigned long) "scsi"; /* XXX */
- disk->data = scsi;
- scsi->dev = p;
- scsi->lun = lun;
- scsi->name = grub_strdup (name);
- if (! scsi->name)
- {
- grub_free (scsi);
- return grub_errno;
- }
+ grub_free (scsi);
+ return grub_errno;
+ }
- grub_dprintf ("scsi", "dev opened\n");
+ grub_dprintf ("scsi", "dev opened\n");
- err = grub_scsi_inquiry (scsi);
- if (err)
- {
- grub_free (scsi);
- grub_dprintf ("scsi", "inquiry failed\n");
- return grub_errno;
- }
+ err = grub_scsi_inquiry (scsi);
+ if (err)
+ {
+ grub_free (scsi);
+ grub_dprintf ("scsi", "inquiry failed\n");
+ return grub_errno;
+ }
- grub_dprintf ("scsi", "inquiry: devtype=0x%02x removable=%d\n",
- scsi->devtype, scsi->removable);
+ grub_dprintf ("scsi", "inquiry: devtype=0x%02x removable=%d\n",
+ scsi->devtype, scsi->removable);
- /* Try to be conservative about the device types
- supported. */
- if (scsi->devtype != grub_scsi_devtype_direct
- && scsi->devtype != grub_scsi_devtype_cdrom)
- {
- grub_free (scsi);
- return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
- "unknown SCSI device");
- }
+ /* Try to be conservative about the device types
+ supported. */
+ if (scsi->devtype != grub_scsi_devtype_direct
+ && scsi->devtype != grub_scsi_devtype_cdrom)
+ {
+ grub_free (scsi);
+ return grub_error (GRUB_ERR_UNKNOWN_DEVICE,
+ "unknown SCSI device");
+ }
- if (scsi->devtype == grub_scsi_devtype_cdrom)
- disk->has_partitions = 0;
- else
- disk->has_partitions = 1;
+ if (scsi->devtype == grub_scsi_devtype_cdrom)
+ disk->has_partitions = 0;
+ else
+ disk->has_partitions = 1;
- err = grub_scsi_read_capacity (scsi);
- if (err)
- {
- grub_free (scsi);
- grub_dprintf ("scsi", "READ CAPACITY failed\n");
- return grub_errno;
- }
+ err = grub_scsi_read_capacity (scsi);
+ if (err)
+ {
+ grub_free (scsi);
+ grub_dprintf ("scsi", "READ CAPACITY failed\n");
+ return grub_errno;
+ }
- /* SCSI blocks can be something else than 512, although GRUB
- wants 512 byte blocks. */
- disk->total_sectors = ((scsi->size * scsi->blocksize)
- << GRUB_DISK_SECTOR_BITS);
+ /* SCSI blocks can be something else than 512, although GRUB
+ wants 512 byte blocks. */
+ disk->total_sectors = ((scsi->size * scsi->blocksize)
+ << GRUB_DISK_SECTOR_BITS);
- grub_dprintf ("scsi", "capacity=%llu, blksize=%d\n",
- (unsigned long long) disk->total_sectors,
- scsi->blocksize);
+ grub_dprintf ("scsi", "capacity=%llu, blksize=%d\n",
+ (unsigned long long) disk->total_sectors,
+ scsi->blocksize);
- return GRUB_ERR_NONE;
- }
+ return GRUB_ERR_NONE;
}
grub_free (scsi);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2345] 2009-06-19 Vladimir Serbinenko <address@hidden>,
Vladimir Serbinenko <=