Merge branch 'master' of github.com:PX4/Firmware into sensor_startup_cleanup

This commit is contained in:
Lorenz Meier
2014-07-16 08:20:48 +02:00
11 changed files with 57 additions and 15 deletions
+5
View File
@@ -240,6 +240,7 @@ private:
* @param context Pointer to the interrupted context.
*/
static void dev_interrupt(int irq, void *context);
};
/**
@@ -469,6 +470,10 @@ private:
* @return OK, or -errno on error.
*/
int remove_poll_waiter(struct pollfd *fds);
/* do not allow copying this class */
CDev(const CDev&);
CDev operator=(const CDev&);
};
/**