| Message ID | 1373364197-14442-2-git-send-email-colin.king@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Jul 9, 2013 at 6:03 PM, Colin King <colin.king@canonical.com> wrote: > From: Colin Ian King <colin.king@canonical.com> > > These need to be in their own header file because we can't put them > in fwts_acpica.h because this includes fwts_acpica.h and this requires > fwts_framework to be defined which needs acpica mode types defined > earlier. So, put them in their own header file to work around this > interdependency mess. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/lib/include/fwts_acpica_mode.h | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > create mode 100644 src/lib/include/fwts_acpica_mode.h > > diff --git a/src/lib/include/fwts_acpica_mode.h b/src/lib/include/fwts_acpica_mode.h > new file mode 100644 > index 0000000..d6d9236 > --- /dev/null > +++ b/src/lib/include/fwts_acpica_mode.h > @@ -0,0 +1,30 @@ > +/* > + * Copyright (C) 2013 Canonical > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License > + * as published by the Free Software Foundation; either version 2 > + * of the License, or (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. > + * > + */ > + > +#ifndef __FWTS_ACPICA_MODE_H__ > +#define __FWTS_ACPICA_MODE_H__ > + > +typedef enum { > + FWTS_ACPICA_MODE_SERIALIZED = 0x00000001, > + FWTS_ACPICA_MODE_SLACK = 0x00000002, > + FWTS_ACPICA_MODE_IGNORE_ERRORS = 0x00000004, > + FWTS_ACPICA_MODE_DISABLE_AUTO_REPAIR = 0x00000008, > +} fwts_acpica_mode; > + > +#endif > -- > 1.8.1.2 > Acked-by: Keng-Yu Lin <kengyu@canonical.com>>
On 07/09/2013 06:03 PM, Colin King wrote: > From: Colin Ian King <colin.king@canonical.com> > > These need to be in their own header file because we can't put them > in fwts_acpica.h because this includes fwts_acpica.h and this requires > fwts_framework to be defined which needs acpica mode types defined > earlier. So, put them in their own header file to work around this > interdependency mess. > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > src/lib/include/fwts_acpica_mode.h | 30 ++++++++++++++++++++++++++++++ > 1 file changed, 30 insertions(+) > create mode 100644 src/lib/include/fwts_acpica_mode.h > > diff --git a/src/lib/include/fwts_acpica_mode.h b/src/lib/include/fwts_acpica_mode.h > new file mode 100644 > index 0000000..d6d9236 > --- /dev/null > +++ b/src/lib/include/fwts_acpica_mode.h > @@ -0,0 +1,30 @@ > +/* > + * Copyright (C) 2013 Canonical > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License > + * as published by the Free Software Foundation; either version 2 > + * of the License, or (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. > + * > + */ > + > +#ifndef __FWTS_ACPICA_MODE_H__ > +#define __FWTS_ACPICA_MODE_H__ > + > +typedef enum { > + FWTS_ACPICA_MODE_SERIALIZED = 0x00000001, > + FWTS_ACPICA_MODE_SLACK = 0x00000002, > + FWTS_ACPICA_MODE_IGNORE_ERRORS = 0x00000004, > + FWTS_ACPICA_MODE_DISABLE_AUTO_REPAIR = 0x00000008, > +} fwts_acpica_mode; > + > +#endif > Acked-by: Alex Hung <alex.hung@canonical.com>
diff --git a/src/lib/include/fwts_acpica_mode.h b/src/lib/include/fwts_acpica_mode.h new file mode 100644 index 0000000..d6d9236 --- /dev/null +++ b/src/lib/include/fwts_acpica_mode.h @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2013 Canonical + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef __FWTS_ACPICA_MODE_H__ +#define __FWTS_ACPICA_MODE_H__ + +typedef enum { + FWTS_ACPICA_MODE_SERIALIZED = 0x00000001, + FWTS_ACPICA_MODE_SLACK = 0x00000002, + FWTS_ACPICA_MODE_IGNORE_ERRORS = 0x00000004, + FWTS_ACPICA_MODE_DISABLE_AUTO_REPAIR = 0x00000008, +} fwts_acpica_mode; + +#endif