← Back to branch summary

~darkmuggle-deactivatedaccount/ubuntu/quantal/grub2/fix-872244

« back to all changes in this revision

Viewing changes to include/grub/ata.h

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2011-05-17 23:59:10 UTC
  • mto: (17.3.55 sid)
  • mto: This revision was merged to the branch mainline in revision 122.
  • Revision ID: james.westby@ubuntu.com-20110517235910-ma8u889vyjdfro27
Tags: upstream-1.99
Import upstream version 1.99

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/grub/ata.h
94
94
enum grub_ata_timeout_milliseconds
95
95
  {
96
96
    GRUB_ATA_TOUT_STD  =  1000,  /* 1s standard timeout.  */
97
 
    GRUB_ATA_TOUT_DATA = 10000   /* 10s DATA I/O timeout.  */
 
97
    GRUB_ATA_TOUT_DATA = 10000,   /* 10s DATA I/O timeout.  */
 
98
    GRUB_ATA_TOUT_DEV_INIT  =  10000,  /* Give the device 10s on first try to spinon.  */
98
99
  };
99
100
 
100
101
struct grub_ata_device
128
129
  /* Set to 0 for ATA, set to 1 for ATAPI.  */
129
130
  int atapi;
130
131
 
 
132
  int present;
 
133
 
131
134
  struct grub_ata_device *next;
132
135
};
133
136