← Back to branch summary

~jsvoboda/helenos/dnsr

« back to all changes in this revision

Viewing changes to uspace/drv/test/test2/test2.c

  • Committer: Jiri Svoboda
  • Date: 2012-11-11 21:31:03 UTC
  • mfrom: (1527.1.178 mainline)
  • Revision ID: jiri@wiwaxia-20121111213103-314bmkettwvlwj97
Merge mainline changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
uspace/drv/test/test2/test2.c
195
195
static int test2_dev_add(ddf_dev_t *dev)
196
196
{
197
197
        test2_t *test2;
 
198
        const char *dev_name = ddf_dev_get_name(dev);
198
199
 
199
200
        ddf_msg(LVL_DEBUG, "test2_dev_add(name=\"%s\", handle=%d)",
200
 
            dev->name, (int) dev->handle);
 
201
            dev_name, (int) ddf_dev_get_handle(dev));
201
202
 
202
203
        test2 = ddf_dev_data_alloc(dev, sizeof(test2_t));
203
204
        if (test2 == NULL) {
207
208
 
208
209
        test2->dev = dev;
209
210
 
210
 
        if (str_cmp(dev->name, "child") != 0) {
 
211
        if (str_cmp(dev_name, "child") != 0) {
211
212
                fid_t postpone = fibril_create(plug_unplug, test2);
212
213
                if (postpone == 0) {
213
214
                        ddf_msg(LVL_ERROR, "fibril_create() failed.");
224
225
 
225
226
static int test2_dev_remove(ddf_dev_t *dev)
226
227
{
227
 
        test2_t *test2 = (test2_t *)dev->driver_data;
 
228
        test2_t *test2 = (test2_t *)ddf_dev_data_get(dev);
228
229
        int rc;
229
230
 
230
231
        ddf_msg(LVL_DEBUG, "test2_dev_remove(%p)", dev);
258
259
 
259
260
static int test2_dev_gone(ddf_dev_t *dev)
260
261
{
261
 
        test2_t *test2 = (test2_t *)dev->driver_data;
 
262
        test2_t *test2 = (test2_t *)ddf_dev_data_get(dev);
262
263
        int rc;
263
264
 
264
265
        ddf_msg(LVL_DEBUG, "test2_dev_gone(%p)", dev);
306
307
int main(int argc, char *argv[])
307
308
{
308
309
        printf(NAME ": HelenOS test2 virtual device driver\n");
309
 
        ddf_log_init(NAME, LVL_NOTE);
 
310
        ddf_log_init(NAME);
310
311
        return ddf_driver_main(&test2_driver);
311
312
}
312
313