← Back to branch summary

~ubuntu-branches/debian/squeeze/hal/squeeze

« back to all changes in this revision

Viewing changes to hald/freebsd/libprobe/hfp-cdrom.c

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2008-03-05 18:14:57 UTC
  • Revision ID: james.westby@ubuntu.com-20080305181457-fj989u7likg0vd6b
Tags: upstream-0.5.10+git20080301
Import upstream version 0.5.10+git20080301

Show diffs side-by-side

added added

removed removed

Lines of Context:
hald/freebsd/libprobe/hfp-cdrom.c
124
124
 
125
125
boolean
126
126
hfp_cdrom_send_ccb (HFPCDROM *cdrom,
127
 
                    char ccb[16],
128
 
                    int timeout,
 
127
                    const char *ccb,
 
128
                    int ccb_len,
129
129
                    HFPCDROMDirection direction,
130
130
                    void *data,
131
131
                    int len,
132
132
                    char **err)
133
133
{
 
134
  int timeout;
 
135
 
134
136
  assert(cdrom != NULL);
135
137
  assert(ccb != NULL);
136
138
  assert(direction == HFP_CDROM_DIRECTION_NONE
138
140
         || direction == HFP_CDROM_DIRECTION_OUT);
139
141
  assert(direction == HFP_CDROM_DIRECTION_NONE || data != NULL);
140
142
 
 
143
  timeout = 10;
 
144
 
141
145
  if (cdrom->fd >= 0)           /* ATAPI transport */
142
146
    {
143
147
#ifdef IOCATAREQUEST
227
231
                    data,
228
232
                    len,
229
233
                    sizeof(cam_ccb.csio.sense_data),
230
 
                    16,
 
234
                    ccb_len,
231
235
                    timeout * 1000);
232
236
 
233
237
      memcpy(cam_ccb.csio.cdb_io.cdb_bytes, ccb, 16);
255
259
 
256
260
  assert(cdrom != NULL);
257
261
 
258
 
  return hfp_cdrom_send_ccb(cdrom, ccb, 10, HFP_CDROM_DIRECTION_NONE, NULL, 0, NULL);
 
262
  return hfp_cdrom_send_ccb(cdrom, ccb, 6, HFP_CDROM_DIRECTION_NONE, NULL, 0, NULL);
259
263
}
260
264
 
261
265
void