diff options
| author | Matthew Hoops | 2012-03-20 14:18:57 -0400 | 
|---|---|---|
| committer | Matthew Hoops | 2012-03-20 14:49:16 -0400 | 
| commit | 71756bdf4eae5ba9cc3f329b85e894f04640aaef (patch) | |
| tree | 40d464262da107ab5eed82f198685209161ebac1 /backends/platform/maemo/maemo-common.h | |
| parent | 03eba05b09e5c9e5a351f8111185934b92a3fed3 (diff) | |
| parent | 3c3576a224b92c703b4e8ea20008ac8a069980dd (diff) | |
| download | scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.gz scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.bz2 scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.zip  | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'backends/platform/maemo/maemo-common.h')
| -rw-r--r-- | backends/platform/maemo/maemo-common.h | 19 | 
1 files changed, 9 insertions, 10 deletions
diff --git a/backends/platform/maemo/maemo-common.h b/backends/platform/maemo/maemo-common.h index f33aa24278..0442b9c0ae 100644 --- a/backends/platform/maemo/maemo-common.h +++ b/backends/platform/maemo/maemo-common.h @@ -28,9 +28,10 @@  namespace Maemo {  enum ModelType { -	kModelTypeN800 = 1, -	kModelTypeN810 = 2, -	kModelTypeN900 = 4, +	kModelType770 = 1 << 0, +	kModelTypeN800 = 1 << 1, +	kModelTypeN810 = 1 << 2, +	kModelTypeN900 = 1 << 3,  	kModelTypeInvalid = 0  }; @@ -38,15 +39,13 @@ struct Model {  	const char *hwId;  	ModelType modelType;  	const char *hwAlias; -	bool hwKeyboard; +	bool hasHwKeyboard; +	bool hasMenuKey;  }; -static const Model models[] = { -	{"RX-34", kModelTypeN800, "N800", false}, -	{"RX-44", kModelTypeN810, "N810", true}, -	{"RX-48", kModelTypeN810, "N810W", true}, -	{"RX-51", kModelTypeN900, "N900", true}, -	{0, kModelTypeInvalid, 0, true} +enum CustomEventType { +	kEventClickMode = 1, +	kEventInvalid = 0  };  } // namespace Maemo  | 
