← Back to branch summary

~ubuntu-branches/ubuntu/hardy/vice/hardy

« back to all changes in this revision

Viewing changes to src/arch/amigaos/joy.c

  • Committer: Bazaar Package Importer
  • Author(s): Laszlo Boszormenyi (GCS)
  • Date: 2007-10-07 07:05:46 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20071007070546-81yy0twlka7p2t0e
Tags: 1.22-1
http://bugs.debian.org/428280
http://bugs.debian.org/409567
* New upstream version (closes: #428280).
* Correct link to HTML documentation in manpage (closes: #409567).
* Fix most packaging mistakes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/arch/amigaos/joy.c
69
69
    joystick_inited = 0;
70
70
}
71
71
 
72
 
static int set_joystick_device_1(resource_value_t v, void *param)
73
 
{
74
 
    joy_arch_init();
75
 
 
76
 
    joystick_device[0] = (int)v;
77
 
 
78
 
    return 0;
79
 
}
80
 
 
81
 
static int set_joystick_device_2(resource_value_t v, void *param)
82
 
{
83
 
    joy_arch_init();
84
 
 
85
 
    joystick_device[1] = (int)v;
86
 
 
87
 
    return 0;
88
 
}
89
 
 
90
 
static const resource_t resources[] = {
91
 
    { "JoyDevice1", RES_INTEGER, (resource_value_t)JOYDEV_NONE,
92
 
      RES_EVENT_NO, NULL,
93
 
      (void *)&joystick_device[0], set_joystick_device_1, NULL },
94
 
    { "JoyDevice2", RES_INTEGER, (resource_value_t)JOYDEV_NONE,
95
 
      RES_EVENT_NO, NULL,
96
 
      (void *)&joystick_device[1], set_joystick_device_2, NULL },
 
72
static int set_joystick_device_1(int val, void *param)
 
73
{
 
74
    joy_arch_init();
 
75
 
 
76
    joystick_device[0] = val;
 
77
 
 
78
    return 0;
 
79
}
 
80
 
 
81
static int set_joystick_device_2(int val, void *param)
 
82
{
 
83
    joy_arch_init();
 
84
 
 
85
    joystick_device[1] = val;
 
86
 
 
87
    return 0;
 
88
}
 
89
 
 
90
static const resource_int_t resources_int[] = {
 
91
    { "JoyDevice1", JOYDEV_NONE, RES_EVENT_NO, NULL,
 
92
      &joystick_device[0], set_joystick_device_1, NULL },
 
93
    { "JoyDevice2", JOYDEV_NONE, RES_EVENT_NO, NULL,
 
94
      &joystick_device[1], set_joystick_device_2, NULL },
97
95
    { NULL }
98
96
};
99
97
 
100
 
int joystick_init_resources(void)
 
98
int joystick_arch_init_resources(void)
101
99
{
102
100
    joyai_init_resources();
103
 
    return resources_register(resources);
 
101
    return resources_register_int(resources_int);
104
102
}
105
103
 
106
104
/* ------------------------------------------------------------------------- */
181
179
        }
182
180
    }
183
181
 
184
 
    if (joystick_device[0] == JOYDEV_KEYSET_A) {
 
182
    if (joystick_device[0] == JOYDEV_KEYSET1) {
185
183
        value |= joyai_key(1, 1, kcode, pressed);
186
184
    }
187
 
    if (joystick_device[0] == JOYDEV_KEYSET_B) {
 
185
    if (joystick_device[0] == JOYDEV_KEYSET2) {
188
186
        value |= joyai_key(2, 1, kcode, pressed);
189
187
    }
190
 
    if (joystick_device[1] == JOYDEV_KEYSET_A) {
 
188
    if (joystick_device[1] == JOYDEV_KEYSET1) {
191
189
        value |= joyai_key(1, 2, kcode, pressed);
192
190
    }
193
 
    if (joystick_device[1] == JOYDEV_KEYSET_B) {
 
191
    if (joystick_device[1] == JOYDEV_KEYSET2) {
194
192
        value |= joyai_key(2, 2, kcode, pressed);
195
193
    }
196
194
 
199
197
 
200
198
int joystick_update(void)
201
199
{
202
 
    if (joystick_device[0] == JOYDEV_KEYSET_A) {
 
200
    if (joystick_device[0] == JOYDEV_KEYSET1) {
203
201
        joyai_update(1, 1);
204
202
    }
205
 
    if (joystick_device[0] == JOYDEV_KEYSET_B) {
 
203
    if (joystick_device[0] == JOYDEV_KEYSET2) {
206
204
        joyai_update(2, 1);
207
205
    }
208
 
    if (joystick_device[1] == JOYDEV_KEYSET_A) {
 
206
    if (joystick_device[1] == JOYDEV_KEYSET1) {
209
207
        joyai_update(1, 2);
210
208
    }
211
 
    if (joystick_device[1] == JOYDEV_KEYSET_B) {
 
209
    if (joystick_device[1] == JOYDEV_KEYSET2) {
212
210
        joyai_update(2, 2);
213
211
    }
214
212