← Back to branch summary

~ubuntu-branches/ubuntu/raring/vice/raring

« back to all changes in this revision

Viewing changes to src/c64/tfe.c

  • Committer: Bazaar Package Importer
  • Author(s): Laszlo Boszormenyi (GCS)
  • Date: 2009-03-31 00:37:15 UTC
  • mfrom: (1.2.2 upstream)
  • mto: This revision was merged to the branch mainline in revision 17.
  • Revision ID: james.westby@ubuntu.com-20090331003715-mzclchtl0dp7fcl0
Tags: upstream-2.1.dfsg
Import upstream version 2.1.dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/c64/tfe.c
45
45
#include "log.h"
46
46
#include "resources.h"
47
47
#include "snapshot.h"
48
 
#ifdef HAS_TRANSLATION
49
48
#include "translate.h"
50
 
#endif
51
49
#include "tfe.h"
52
50
#include "tfearch.h"
53
51
#include "snapshot.h"
463
461
 
464
462
        tfe_arch_post_reset();
465
463
 
466
 
        log_message(tfe_log,("CS8900a rev.D reset"));
 
464
        log_message(tfe_log,"CS8900a rev.D reset");
467
465
    }
468
466
}
469
467
 
1170
1168
 
1171
1169
            tfe_arch_set_hashfilter(tfe_hash_mask);
1172
1170
 
 
1171
#if 0
1173
1172
            if(odd_address && (ppaddress == TFE_PP_ADDR_LOG_ADDR_FILTER+6))
1174
1173
                log_message(tfe_log,"set hash filter: %02x:%02x:%02x:%02x:%02x:%02x",
1175
 
                            tfe_hash_mask[0],tfe_hash_mask[1],tfe_hash_mask[2],
1176
 
                            tfe_hash_mask[3],tfe_hash_mask[4],tfe_hash_mask[5]);
 
1174
                            tfe_hash_mask[0],
 
1175
                            tfe_hash_mask[1],
 
1176
                            tfe_hash_mask[2],
 
1177
                            tfe_hash_mask[3],
 
1178
                            tfe_hash_mask[4],
 
1179
                            tfe_hash_mask[5]);
 
1180
#endif
1177
1181
        }
1178
1182
        break;
1179
1183
 
1732
1736
#endif
1733
1737
    } else {
1734
1738
        /* write a register */
1735
 
        WORD ppaddress;
 
1739
 
 
1740
        /*! \TODO: Find a reasonable default */
 
1741
        WORD ppaddress = TFE_PP_ADDR_PRODUCTID;
1736
1742
 
1737
1743
        /* now determine address of write in packet page */
1738
1744
        switch(reg_base) {
1908
1914
/* ------------------------------------------------------------------------- */
1909
1915
/*    commandline support functions                                          */
1910
1916
 
1911
 
#ifdef HAS_TRANSLATION
1912
 
static const cmdline_option_t cmdline_options[] =
1913
 
{
1914
 
    { "-tfe", SET_RESOURCE, 0, NULL, NULL, "ETHERNET_ACTIVE", (resource_value_t)1,
1915
 
      0, IDCLS_ENABLE_TFE },
1916
 
    { "+tfe", SET_RESOURCE, 0, NULL, NULL, "ETHERNET_ACTIVE", (resource_value_t)0,
1917
 
      0, IDCLS_DISABLE_TFE },
1918
 
    { "-tfeif", SET_RESOURCE, 1, NULL, NULL, "ETHERNET_INTERFACE", NULL,
1919
 
      IDCLS_P_NAME, IDCLS_TFE_INTERFACE },
1920
 
    { "-tferrnet", SET_RESOURCE, 0, NULL, NULL, "ETHERNET_AS_RR", (resource_value_t)1,
1921
 
      0, IDCLS_ENABLE_TFE_AS_RRNET },
1922
 
    { "+tferrnet", SET_RESOURCE, 0, NULL, NULL, "ETHERNET_AS_RR", (resource_value_t)0,
1923
 
      0, IDCLS_DISABLE_TFE_AS_RRNET },
1924
 
    { NULL }
1925
 
};
1926
 
#else
1927
 
static const cmdline_option_t cmdline_options[] =
1928
 
{
1929
 
    { "-tfe", SET_RESOURCE, 0, NULL, NULL, "ETHERNET_ACTIVE", (resource_value_t)1,
1930
 
      NULL, N_("Enable the TFE (\"The Final Ethernet\") unit") },
1931
 
    { "+tfe", SET_RESOURCE, 0, NULL, NULL, "ETHERNET_ACTIVE", (resource_value_t)0,
1932
 
      NULL, N_("Disable the TFE (\"The Final Ethernet\") unit") },
1933
 
    { "-tfeif", SET_RESOURCE, 1, NULL, NULL, "ETHERNET_INTERFACE", NULL,
1934
 
      N_("<name>"), N_("Set the system ethernet interface for TFE emulation") },
1935
 
    { "-tferrnet", SET_RESOURCE, 0, NULL, NULL, "ETHERNET_AS_RR", (resource_value_t)1,
1936
 
      0, N_("Enable RRNet mode of TFE emulation") },
1937
 
    { "+tferrnet", SET_RESOURCE, 0, NULL, NULL, "ETHERNET_AS_RR", (resource_value_t)0,
1938
 
      0, N_("Disable RRNet mode of TFE emulation") },
1939
 
    { NULL }
1940
 
};
1941
 
#endif
 
1917
static const cmdline_option_t cmdline_options[] =
 
1918
{
 
1919
    { "-tfe", SET_RESOURCE, 0,
 
1920
      NULL, NULL, "ETHERNET_ACTIVE", (resource_value_t)1,
 
1921
      USE_PARAM_STRING, USE_DESCRIPTION_ID,
 
1922
      IDCLS_UNUSED, IDCLS_ENABLE_TFE,
 
1923
      NULL, NULL },
 
1924
    { "+tfe", SET_RESOURCE, 0,
 
1925
      NULL, NULL, "ETHERNET_ACTIVE", (resource_value_t)0,
 
1926
      USE_PARAM_STRING, USE_DESCRIPTION_ID,
 
1927
      IDCLS_UNUSED, IDCLS_DISABLE_TFE,
 
1928
      NULL, NULL },
 
1929
    { "-tfeif", SET_RESOURCE, 1,
 
1930
      NULL, NULL, "ETHERNET_INTERFACE", NULL,
 
1931
      USE_PARAM_ID, USE_DESCRIPTION_ID,
 
1932
      IDCLS_P_NAME, IDCLS_TFE_INTERFACE,
 
1933
      NULL, NULL },
 
1934
    { "-tferrnet", SET_RESOURCE, 0,
 
1935
      NULL, NULL, "ETHERNET_AS_RR", (resource_value_t)1,
 
1936
      USE_PARAM_STRING, USE_DESCRIPTION_ID,
 
1937
      IDCLS_UNUSED, IDCLS_ENABLE_TFE_AS_RRNET,
 
1938
      NULL, NULL },
 
1939
    { "+tferrnet", SET_RESOURCE, 0,
 
1940
      NULL, NULL, "ETHERNET_AS_RR", (resource_value_t)0,
 
1941
      USE_PARAM_STRING, USE_DESCRIPTION_ID,
 
1942
      IDCLS_UNUSED, IDCLS_DISABLE_TFE_AS_RRNET,
 
1943
      NULL, NULL },
 
1944
    { NULL }
 
1945
};
1942
1946
 
1943
1947
int tfe_cmdline_options_init(void)
1944
1948
{